otacke
Repository rebase failed |
8 days ago
|
otacke
Repository rebase failed |
Rebasing (1/1) Auto-merging language/nl.json CONFLICT (content): Merge conflict in language/nl.json error: could not apply 292c3c1... René Breedveld <info@qsento.nl> updated Dutch translation using Weblate @ translate-h5p.tk. hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 292c3c1... René Breedveld <info@qsento.nl> updated Dutch translation using Weblate @ translate-h5p.tk. (1)8 days ago |
otacke
Repository rebase failed |
Rebasing (1/1) Auto-merging language/nl.json CONFLICT (content): Merge conflict in language/nl.json error: could not apply 292c3c1... René Breedveld <info@qsento.nl> updated Dutch translation using Weblate @ translate-h5p.tk. hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 292c3c1... René Breedveld <info@qsento.nl> updated Dutch translation using Weblate @ translate-h5p.tk. (1)8 days ago |
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|
sydtfrank
Suggestion added |
|