2. H5P
3. Changes

Component seems unused. 2 months ago

Component seems unused. 2 months ago

Repository rebased

Original revision: 7f0b676c57092199128f5b98d1ee41c191298405
New revision: 2727cc2ccdccc0333ee3cb2b09dbeae50dc141da 2 months ago

GitHub: https://github.com/otacke/h5p-info-wall, master 2 months ago

Repository rebased

Original revision: 050dba5406c49333bc1ea208f995107fc71055c5
New revision: 7f0b676c57092199128f5b98d1ee41c191298405 2 months ago

GitHub: https://github.com/otacke/h5p-info-wall, master 2 months 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)

2 months ago

GitHub: https://github.com/otacke/h5p-dictation, master 2 months 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)

2 months ago

GitHub: https://github.com/otacke/h5p-dictation, master 2 months ago

The component was automatically locked because of an alert. 2 months ago

Could not merge the repository. 2 months 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)

2 months ago

GitHub: https://github.com/otacke/h5p-dictation, master 2 months ago

Component seems unused. 2 months ago