None
Repository rebased |
|
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-kewar-code, master
a month ago
|
None
Repository rebase failed |
warning: skipped previously applied commit c00e758 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging src/scripts/h5p-crossword.js CONFLICT (content): Merge conflict in src/scripts/h5p-crossword.js error: could not apply 6b47020... Fix H5P contract before attached 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 6b47020... Fix H5P contract before attached (1)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-crossword, master
a month ago
|
None
Repository rebase failed |
warning: skipped previously applied commit c00e758 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging src/scripts/h5p-crossword.js CONFLICT (content): Merge conflict in src/scripts/h5p-crossword.js error: could not apply 6b47020... Fix H5P contract before attached 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 6b47020... Fix H5P contract before attached (1)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-crossword, master
a month ago
|
None
Repository rebase failed |
warning: skipped previously applied commit c00e758 hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config advice.skippedCherryPicks false" Rebasing (1/1) Auto-merging src/scripts/h5p-crossword.js CONFLICT (content): Merge conflict in src/scripts/h5p-crossword.js error: could not apply 6b47020... Fix H5P contract before attached 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 6b47020... Fix H5P contract before attached (1)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-crossword, master
a month ago
|
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)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-game-map, master
a month ago
|
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)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-game-map, master
a month ago
|
marionf
Language added |
Norwegian Nynorsk
a month ago
|
marionf
Changes committed |
Changes committed
a month ago
|
marionf
Repository rebased |
Repository rebased
Original revision: 2ef02dd417d868fc7c8c8a9efad47ef3cb6f93bf New revision: 07790bd05a688d13d435841171a09ebed0527f23 a month ago |
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)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-game-map, master
a month ago
|
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)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-game-map, master
a month ago
|
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)a month ago |
Original revision: 0bffd27ed295dd1010ae1693564aa0631af2f358
New revision: ea9f4556bf28aea606e940cd3cfd96bcb83e66a2 a month ago