2. H5P
3. 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: 411302a39ce6ded73b0739cf3669240750675e7c
New revision: ef65550f3a014d1eec0cf5838695ec8479c81896 a month ago

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

Repository rebased

Original revision: 696d07d8a5e20272c498e154f81999dac13a8c76
New revision: e30d1cd8fcdaa4f161b35090c75fc175280f917b a month ago

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

Repository rebased

Original revision: 1156663ac99f0230baadd92fbbc69bcb5b4ebc9d
New revision: 044cceb2bbcf6e06517f8f296c2dcd221230c4d0 a month ago

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

Repository rebased

Original revision: e7b90c2adfc48d9a9b5a95e72855bc7122d376b2
New revision: 795ef056e52c82da847a79dba32f5ad2426bc35f a month ago

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

Repository rebased

Original revision: 0c95637329ec7adb26b2826d61230ace5a5b6280
New revision: a4e5b75886a95c0e3be6b0cef658ff32c3babc2d a month ago

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

Repository rebased

Original revision: 3a0714bf8e06e596158ff0d49f94e9e0bde00c0e
New revision: ea91f89c52cc40965cc0c2f6fe6ebd52114c0c89 a month ago

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

Repository rebased

Original revision: f266f67d93439da59896111029d4a63d4172613b
New revision: 7ef9e61f4a84b11d91a3bd8b89053d04e9507c99 a month ago

GitHub: https://github.com/otacke/h5p-ar-scavenger, 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