User avatar None

Repository rebase failed

Rebasing (1/2)
Auto-merging language/nl.json
CONFLICT (add/add): Merge conflict in language/nl.json
error: could not apply 9d55fbc... Update translation files
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 9d55fbc... Update translation files
 (1)
7 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-game-map, master 7 months ago
User avatar None

Repository rebase failed

Rebasing (1/2)
Auto-merging language/nl.json
CONFLICT (add/add): Merge conflict in language/nl.json
error: could not apply 9d55fbc... Update translation files
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 9d55fbc... Update translation files
 (1)
7 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-game-map, master 7 months ago
User avatar None

Suggestion removed during cleanup

7 months ago
User avatar kovacsmark

Changes pushed

Changes pushed 7 months ago
User avatar kovacsmark

Translation approved

7 months ago
User avatar kovacsmark

Changes pushed

Changes pushed 7 months ago
User avatar kovacsmark

Repository rebased

Repository rebased

Original revision: 9b2695c3a7cb20db59fcd6bb34ab72a2816ba7b8
New revision: d01b62176d327c4f27898ed50d540aa90cad49c1 7 months ago
User avatar kovacsmark

Changes committed

Changes committed 7 months ago
User avatar kovacsmark

Translation approved

7 months ago
User avatar kovacsmark

Translation approved

7 months ago
User avatar kovacsmark

Translation approved

7 months ago
User avatar kovacsmark

Translation approved

7 months ago
User avatar kovacsmark

Translation approved

7 months ago
User avatar kovacsmark

Translation approved

7 months ago
User avatar kovacsmark

Translation approved

7 months ago
User avatar kovacsmark

Translation approved

7 months ago
User avatar kovacsmark

Translation approved

7 months ago
User avatar kovacsmark

Translation approved

7 months ago

Search