2. H5P
3. Changes

Rebasing (1/6)
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
Auto-merging src/scripts/components/threed-model-view.js
error: could not apply d7ad6e6... Add minimum height option
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 d7ad6e6... Add minimum height option
 (1)

6 days 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)

6 days ago

warning: skipped previously applied commit 36c0e7f
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/app.js
CONFLICT (content): Merge conflict in src/scripts/app.js
error: could not apply 5d957c4... Fix fullscreen in preview
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 5d957c4... Fix fullscreen in preview
 (1)

6 days ago

Rebasing (1/5)
dropping c471ac87b9881035fc2c117e9bfb53ea2d2f320a Kovács Márk <kovacs.mark@htk.uni-pannon.hu> updated Hungarian translation using Weblate @ translate-h5p.tk. -- patch contents already upstream
Rebasing (2/5)
dropping 60f4edf3cce0dad7b37e226e9b382f0f9c0262c6 Paolo Mauri <paolo@paolomauri.it> updated Italian translation using Weblate @ translate-h5p.tk. -- patch contents already upstream
Rebasing (3/5)
Rebasing (4/5)
Rebasing (5/5)
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
error: could not apply fe66304... 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 fe66304... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
 (1)

6 days ago

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

6 days ago

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

6 days ago

warning: skipped previously applied commit 886ebfa
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/3)
Rebasing (2/3)
Auto-merging language/he.json
CONFLICT (add/add): Merge conflict in language/he.json
error: could not apply 486e59f... 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 486e59f... Update translation files
 (1)

6 days ago

Rebasing (1/6)
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
Auto-merging src/scripts/components/threed-model-view.js
error: could not apply d7ad6e6... Add minimum height option
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 d7ad6e6... Add minimum height option
 (1)

6 days ago

warning: skipped previously applied commit 36c0e7f
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/app.js
CONFLICT (content): Merge conflict in src/scripts/app.js
error: could not apply 5d957c4... Fix fullscreen in preview
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 5d957c4... Fix fullscreen in preview
 (1)

6 days ago

Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Auto-merging language/de.json
CONFLICT (add/add): Merge conflict in language/de.json
error: could not apply ada62c9... 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 ada62c9... Update translation files
 (1)

6 days ago

Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Auto-merging language/de.json
CONFLICT (add/add): Merge conflict in language/de.json
error: could not apply ada62c9... 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 ada62c9... Update translation files
 (1)

6 days ago

Repository rebased

Original revision: a7b461b4247c928d8008e7ce259e080b102bdf48
New revision: 93d3b3e5e939453afd88913026c0daceeb0711d1 6 days ago

Repository rebased

Original revision: eb3df95613d1e9ed1b73866080e51202d196b064
New revision: f1a56842ba0460f5f5bcd7717c8935367b889567 6 days ago

Repository rebased

Original revision: 432be76415f38d65adb799eeddc6a8d1d5dbc685
New revision: d32b8058e9e2c506fb0d1be27a3a746239c3cc95 6 days ago

Repository rebased

Original revision: 0a7957a886e619406c34390ad20c581a9256ff2b
New revision: 373b28921552570ee67b7b322757c7cc76d33e28 6 days ago

Repository rebased

Original revision: 6750626179085023aa2a08f65369168134fc0355
New revision: d281a2ea3be27816ada8d8df8557edb874d38302 6 days ago

Repository rebased

Original revision: fa9b409100f110dffbb0461987e80606378cc10d
New revision: a9a2c8c90c0362a26ffac58d3c6c16242f4474da 6 days ago

Repository rebased

Original revision: 80f6fd92325b34f8ec2162ecb2cbf660f1662f40
New revision: 2fe1f4588d0193fcd4552f44c3e045a2781fd7cb 6 days ago

Repository rebased

Original revision: 176b4becb6603cb5e05ab3be1c39125a2ed0aa4b
New revision: 048e637052ae827d837a82924dec5ee6ee087e15 6 days ago

Repository rebased

Original revision: bc2787905f7f131381cfcfbba7bbe2a6f5e4566d
New revision: 71b613ebed20a1a7d502849852ce61f159fad088 6 days ago