2. H5P
3. h5p-dictation
4. Changes

Repository outdated. 3 weeks ago

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)

3 weeks ago

GitHub: https://github.com/otacke/h5p-dictation, master 3 weeks ago

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