User avatar serettig

Repository rebase failed

Rebasing (1/9)
error: could not apply 1a7a2b1... Anonymous <noreply@weblate.org> 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 1a7a2b1... Anonymous <noreply@weblate.org> updated Norwegian Nynorsk translation using Weblate @ translate-h5p.tk.
CONFLICT (modify/delete): language/nn.json deleted in HEAD and modified in 1a7a2b1 (Anonymous <noreply@weblate.org> updated Norwegian Nynorsk translation using Weblate @ translate-h5p.tk.). Version 1a7a2b1 (Anonymous <noreply@weblate.org> updated Norwegian Nynorsk translation using Weblate @ translate-h5p.tk.) of language/nn.json left in tree.
 (1)
2 years ago

Search