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)
2 months ago
User avatar None

Repository notification received

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

Repository rebased

Repository rebased

Original revision: 34b1ae4df7bb573a5b800790f62ea85a872777a5
New revision: 1c163df6c3575d6d9cbc164da46ab6e0f3a4946c 2 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-dictation, master 2 months ago
User avatar marionf

Translation changed

2 months ago
User avatar None

Changes committed

Changes committed 2 months ago
User avatar marionf

Suggestion accepted

2 months ago
User avatar None

Changes committed

Changes committed 2 months ago
User avatar None

Changes committed

Changes committed 2 months ago
User avatar marionf

Translation changed

2 months ago
User avatar marionf

Translation changed

2 months ago
User avatar marionf

Translation changed

2 months ago
User avatar marionf

Translation changed

2 months ago
User avatar marionf

Suggestion accepted

2 months ago
User avatar marionf

Suggestion accepted

2 months ago
User avatar marionf

Suggestion accepted

2 months ago
User avatar marionf

Suggestion accepted

2 months ago
User avatar marionf

Translation changed

2 months ago
User avatar marionf

Suggestion accepted

2 months ago
User avatar marionf

Suggestion accepted

2 months ago

Search