2. H5P
3. h5p-vocabulary-drill
4. Changes

Fixing an alert automatically unlocked the component. 8 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 8 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 8 months ago

Broken project website URL 8 months ago

Could not update the repository. 8 months ago

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

8 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 8 months ago

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

8 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 8 months ago

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

8 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 8 months ago

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

Could not merge the repository. 8 months ago

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

8 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 8 months ago

Repository rebased 8 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 8 months ago

Repository rebased 8 months ago

GitHub: https://github.com/NDLANO/h5p-vocabulary-drill, master 8 months ago

Repository rebased 8 months ago