2. H5P
3. h5p-order-priority
4. Changes

warning: skipped previously applied commit 650a4ad
warning: skipped previously applied commit 1110908
warning: skipped previously applied commit 3d3d603
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/4)
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
error: could not apply 79db125... 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 79db125... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
 (1)

a month ago

GitHub: https://github.com/NDLANO/h5p-order-priority, master a month ago

warning: skipped previously applied commit 650a4ad
warning: skipped previously applied commit 1110908
warning: skipped previously applied commit 3d3d603
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/4)
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
error: could not apply 79db125... 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 79db125... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk.
 (1)

a month ago

GitHub: https://github.com/NDLANO/h5p-order-priority, master a month ago

The component was automatically locked because of an alert. a month ago

Could not merge the repository. a month ago

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

a month ago

GitHub: https://github.com/NDLANO/h5p-order-priority, master a month ago

Changes committed a month ago

Changes committed a month ago

English Norwegian Bokmål 0 characters edited Current translation Approved a month ago

English Norwegian Bokmål 0 characters edited Current translation Approved a month ago

English Norwegian Bokmål 1 character edited Current translation Translated a month ago

English Norwegian Nynorsk 1 character edited Current translation Approved a month ago

English Norwegian Bokmål 1 character edited Current translation Approved a month ago

English Norwegian Nynorsk 3 characters edited Current translation Approved a month ago

English Norwegian Bokmål 3 characters edited Current translation Translated a month ago

English Norwegian Bokmål 7 characters edited Current translation Approved a month ago

English Norwegian Nynorsk 7 characters edited Current translation Approved a month ago

English Norwegian Nynorsk 3 characters edited Current translation Approved a month ago