serettig
Changes pushed |
Changes pushed
a year ago
|
None
Component unlocked |
Fixing an alert automatically unlocked the component.
a year ago
|
Rita
Suggestion added |
|
otacke
Repository merge failed |
Auto-merging language/uk.json CONFLICT (add/add): Merge conflict in language/mn.json Auto-merging language/mn.json CONFLICT (add/add): Merge conflict in language/lt.json Auto-merging language/lt.json Auto-merging language/he.json Auto-merging language/gl.json CONFLICT (content): Merge conflict in language/gl.json Auto-merging language/es.json CONFLICT (content): Merge conflict in language/es.json Automatic merge failed; fix conflicts and then commit the result. (1)a year ago |
otacke
Repository merge failed |
Auto-merging language/uk.json CONFLICT (add/add): Merge conflict in language/mn.json Auto-merging language/mn.json CONFLICT (add/add): Merge conflict in language/lt.json Auto-merging language/lt.json Auto-merging language/he.json Auto-merging language/gl.json CONFLICT (content): Merge conflict in language/gl.json Auto-merging language/es.json CONFLICT (content): Merge conflict in language/es.json Automatic merge failed; fix conflicts and then commit the result. (1)a year ago |
otacke
Repository rebase failed |
Rebasing (1/3) error: could not apply 06dd4b4... Gintarė <gintare.lose@ktu.lt> updated Lithuanian 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 06dd4b4... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk. CONFLICT (add/add): Merge conflict in language/lt.json Auto-merging language/lt.json (1)a year ago |
otacke
Repository merge failed |
Auto-merging language/uk.json CONFLICT (add/add): Merge conflict in language/mn.json Auto-merging language/mn.json CONFLICT (add/add): Merge conflict in language/lt.json Auto-merging language/lt.json Auto-merging language/he.json Auto-merging language/gl.json CONFLICT (content): Merge conflict in language/gl.json Auto-merging language/es.json CONFLICT (content): Merge conflict in language/es.json Automatic merge failed; fix conflicts and then commit the result. (1)a year ago |