User avatar None

Repository rebase failed

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

Repository notification received

GitHub: https://github.com/otacke/h5p-editor-phrase-randomizer, master a month ago
User avatar None

Repository rebased

Repository rebased

Original revision: 0fd361813a62bead785b27831fc15c362fc7ee9d
New revision: b2a25ff5e8f126ccba10f4bd45c832d5762c8358 a month ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-phrase-randomizer, master a month ago
User avatar None

Repository rebased

Repository rebased

Original revision: d61ac5fb328238702af10daadf6994dcb0840fe9
New revision: c0579d241b8b2cad7f8e4c3b4b41c6f094a73b4c a month ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-topic-map, master a month ago
User avatar kaisas

Suggestion added

a month ago
User avatar kaisas

Suggestion added

a month ago
User avatar kaisas

Suggestion added

a month ago
User avatar None

Resource updated

Parsing of the “language/es-mx.json” file was enforced. a month ago
User avatar None

Parsing failed

language/es-MX.json: No such file or directory a month ago
User avatar None

Repository rebased

Repository rebased

Original revision: b9b180f4b68a92a228516058049b322fee40bdbf
New revision: d61ac5fb328238702af10daadf6994dcb0840fe9 a month ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-topic-map, master a month ago
User avatar None

Repository rebased

Repository rebased

Original revision: 998795702f042be0623e506e58dff220a196d344
New revision: 937d4dc0bb65be9dc9e6c2624a2cc606a2cd53c7 a month ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-ndla-timeline, master a month ago
User avatar None

Repository rebased

Repository rebased

Original revision: 443e68e48ad0c28f21e0a1f23ea25a9dd930c279
New revision: f3b4a2b2a2af1505e959508b01d7f17d5e230722 a month ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, master a month ago
User avatar marionf

Translation approved

a month ago
User avatar NDLAsprkteam

Suggestion added

a month ago
User avatar marionf

Translation approved

a month ago

Search