2. Changes

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

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)

2 weeks ago

GitHub: https://github.com/otacke/h5p-crossword, master 2 weeks ago

ab.tbx: No such file or directory 2 weeks ago

Rebasing (1/3)
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
error: could not apply b56bb52... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
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 b56bb52... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
 (1)

2 weeks ago

GitHub: https://github.com/otacke/h5p-dictation, master 2 weeks ago

Repository rebased

Original revision: d72c1bf0b97b31f50566e4e0620933290db66991
New revision: 696d07d8a5e20272c498e154f81999dac13a8c76 2 weeks ago

GitHub: https://github.com/otacke/h5p-content-compiler, master 2 weeks ago

Repository rebased

Original revision: 4993ea1f23d32cd4f4dbe6e045eb64b9c4c91146
New revision: 1156663ac99f0230baadd92fbbc69bcb5b4ebc9d 2 weeks ago

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

Repository rebased

Original revision: f7ac8bbd3170c807c8ad8681b3b4d909142e1d28
New revision: 0c95637329ec7adb26b2826d61230ace5a5b6280 2 weeks ago

GitHub: https://github.com/otacke/h5p-combination-lock, master 2 weeks ago

Repository rebased

Original revision: 2b218be0b826abbd60db104d5b19c794eaaa70e4
New revision: f266f67d93439da59896111029d4a63d4172613b 2 weeks ago

GitHub: https://github.com/otacke/h5p-ar-scavenger, master 2 weeks ago

ab.tbx: No such file or directory 2 weeks ago

ab.tbx: No such file or directory 2 weeks ago

ab.tbx: No such file or directory 2 weeks ago

ab.tbx: No such file or directory 2 weeks 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 weeks ago

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