2. Changes

GitHub: https://github.com/Lumieducation/H5P-Nodejs-library, master 11 months ago

Repository rebased 11 months ago

GitHub: https://github.com/otacke/h5p-portfolio-placeholder, master 11 months ago

Repository rebased 11 months ago

GitHub: https://github.com/otacke/h5p-discrete-option-multi-choice, master 11 months ago

Repository rebased 11 months ago

GitHub: https://github.com/otacke/h5p-discrete-option-multi-choice, master 11 months ago

Rebasing (1/8)
Rebasing (2/8)
error: could not apply 1c4fdd9... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1c4fdd9... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
 (1)

11 months ago

Changes committed 11 months ago

Repository rebased 11 months ago

GitHub: https://github.com/Lumieducation/H5P-Nodejs-library, master 11 months ago

Repository rebased 11 months ago

GitHub: https://github.com/Lumieducation/H5P-Nodejs-library, master 11 months ago

Rebasing (1/1)
error: could not apply ff16d2a... Anonymous <noreply@weblate.org> updated Lithuanian translation using Weblate @ translate-h5p.tk.
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply ff16d2a... Anonymous <noreply@weblate.org> updated Lithuanian translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/lt.json
Auto-merging language/lt.json
 (1)

11 months ago

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

Rebasing (1/1)
error: could not apply ff16d2a... Anonymous <noreply@weblate.org> updated Lithuanian translation using Weblate @ translate-h5p.tk.
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply ff16d2a... Anonymous <noreply@weblate.org> updated Lithuanian translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/lt.json
Auto-merging language/lt.json
 (1)

11 months ago

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

English Norwegian Nynorsk 56 characters edited 11 months ago

English Norwegian Nynorsk 48 characters edited 11 months ago

English Norwegian Nynorsk 51 characters edited Current translation 11 months ago