otacke
Changes pushed |
Changes pushed
a year ago
|
otacke
Repository rebased |
Repository rebased
a year ago
|
None
Component unlocked |
Fixing an alert automatically unlocked the component.
a year ago
|
zurabi87
Repository rebase failed |
Rebasing (1/2) error: could not apply a76a424... Zurab Andguladze <zura.andguladze@gmail.com> updated Georgian translation using Weblate @ translate-h5p.tk. Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply a76a424... Zurab Andguladze <zura.andguladze@gmail.com> updated Georgian translation using Weblate @ translate-h5p.tk. CONFLICT (add/add): Merge conflict in language/ka.json Auto-merging language/ka.json (1)a year ago |
zurabi87
Repository rebase failed |
Rebasing (1/2) error: could not apply a76a424... Zurab Andguladze <zura.andguladze@gmail.com> updated Georgian translation using Weblate @ translate-h5p.tk. Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply a76a424... Zurab Andguladze <zura.andguladze@gmail.com> updated Georgian translation using Weblate @ translate-h5p.tk. CONFLICT (add/add): Merge conflict in language/ka.json Auto-merging language/ka.json (1)a year ago |