2. Changes

GitHub: https://github.com/otacke/h5p-editor-important-description, master 2 months ago

Changes pushed 2 months ago

Repository rebased

Original revision: da4ec779c55c1d8e8a899b9efa3901c89040eb0d
New revision: 82cfd9dbf78d52ed08399486e1cc416ec675887e 2 months ago

GitHub: https://github.com/otacke/h5p-content-calendar, master 2 months ago

Changes committed 2 months ago

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

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

Repository rebased

Original revision: 2973e050d2919684a3ff1615daa1d29120fe0dfd
New revision: ce9ffbd330ddab112b2aa700ec954b917885b633 2 months ago

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

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

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

Repository rebased

Original revision: 9623cf371a7fe7da858d614535b1167f8266a1fe
New revision: 2973e050d2919684a3ff1615daa1d29120fe0dfd 2 months ago

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

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

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

The “language/zh-cn.json” file was changed. 2 months ago

Repository rebased

Original revision: 1c84f7160d4fd66d15e4722f7711dbff17c30d00
New revision: f24cf41e5190962d7a2f44047eaa7c5dc084a613 2 months ago

GitHub: https://github.com/otacke/h5p-info-wall, master 2 months ago

Repository rebased

Original revision: e19194d1cf28b3f6e555572a7d443336ea2dc76a
New revision: 68e20a35c7b52420b0b4c26cfb225b32f8bb33db 2 months ago

GitHub: https://github.com/otacke/h5p-cornell, master 2 months ago