User avatar None

Repository rebase failed

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)
17 hours ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-dictation, master 17 hours ago
User avatar None

Repository rebase failed

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)
17 hours ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-dictation, master 17 hours ago
User avatar None

Repository rebase failed

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)
17 hours ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-dictation, master 17 hours ago
User avatar None

Changes committed

Changes committed yesterday
User avatar None

Changes committed

Changes committed yesterday
User avatar None

Changes committed

Changes committed yesterday
User avatar None

Changes committed

Changes committed yesterday
User avatar None

Changes committed

Changes committed yesterday
User avatar None

Component locked

The component was automatically locked because of an alert. yesterday
User avatar None

Alert triggered

Could not merge the repository. yesterday
User avatar None

Repository rebase failed

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

Changes committed

Changes committed yesterday
User avatar None

Changes committed

Changes committed yesterday
User avatar None

Changes committed

Changes committed 2 days ago
User avatar None

Changes committed

Changes committed 2 days ago
User avatar None

Changes committed

Changes committed 2 days ago
User avatar None

Changes committed

Changes committed 2 days ago

Search