2. Changes

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)

a month ago

GitHub: https://github.com/otacke/h5p-dictation, master a month 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)

a month ago

GitHub: https://github.com/otacke/h5p-crossword, master a month ago

Repository rebased

Original revision: 8623831e5bf896f111df860f814f95bf10b8090a
New revision: 5a7a79105647a3132b1adc1f62bd1794a5b097f1 a month ago

GitHub: https://github.com/otacke/h5p-cornell, master a month ago

Repository rebased

Original revision: 4d9bdc34575a0e6b4f5417ef965687faef26e1aa
New revision: 090fb7cfd82beb297d138d3b5e27f15c8d568174 a month ago

GitHub: https://github.com/otacke/h5p-content-compiler, master a month ago

Repository rebased

Original revision: 78ada1499fafdbb61aad5557857cf0300ec77204
New revision: 0a43cba56041e34cb4c61d5f1a4859a15959cc8e a month ago

GitHub: https://github.com/otacke/h5p-content-calendar, master a month ago

Repository rebased

Original revision: 69508bc1ab63d19e733dfc1adc76a32ff49f0c8c
New revision: bc1b3aa865a89085961ca4e91f3dc92657e7f895 a month ago

GitHub: https://github.com/otacke/h5p-completion-confirmation, master a month ago

Repository rebased

Original revision: f27a1cbf05b6171f9284bccc764ff2b588f8a8a0
New revision: 3e0be72d4c0ef93d2a5ba4151ec7f008a7689671 a month ago

GitHub: https://github.com/otacke/h5p-combination-lock, master a month ago

Repository rebased

Original revision: ffcd0f11ff11e7ae139c989543c9507d30c85470
New revision: 435b330946125dbb4f1d3f3b6ecb6cdb74b34f60 a month ago

GitHub: https://github.com/otacke/h5p-bingo, master a month ago

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
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 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)

a month ago

GitHub: https://github.com/otacke/h5p-agamotto, master a month ago

Repository rebased

Original revision: d2b12e6a89018d87dc6ee012a9899a068fa49882
New revision: 52f3b5093ceaef54d57ec72aa72d59618e56df42 a month ago

GitHub: https://github.com/otacke/h5p-advent-calendar, master a month ago