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)
14 hours ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-game-map, master 14 hours 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)
14 hours ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-game-map, master 14 hours 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)
15 hours ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-game-map, master 15 hours 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)
15 hours ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-game-map, master 15 hours ago
User avatar germanvaleroelizondo

Changes pushed

Changes pushed yesterday
User avatar germanvaleroelizondo

Changes committed

Changes committed yesterday
User avatar germanvaleroelizondo

Translation approved

yesterday
User avatar germanvaleroelizondo

Translation approved

yesterday
User avatar germanvaleroelizondo

Translation approved

yesterday
User avatar germanvaleroelizondo

Translation approved

yesterday
User avatar germanvaleroelizondo

Translation approved

yesterday
User avatar germanvaleroelizondo

Translation approved

yesterday
User avatar germanvaleroelizondo

Translation approved

yesterday
User avatar germanvaleroelizondo

Translation approved

yesterday
User avatar germanvaleroelizondo

Translation approved

yesterday
User avatar germanvaleroelizondo

Translation approved

yesterday

Search