None
Repository rebase failed |
2 weeks ago
|
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-sort-paragraphs, master
2 weeks ago
|
None
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 0c23e55... 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 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-sort-paragraphs, master
a month ago
|
grays552
Suggestion added |
|
None
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 0c23e55... 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 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-sort-paragraphs, master
a month ago
|
None
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 0c23e55... 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 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-sort-paragraphs, master
a month ago
|
None
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 0c23e55... 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 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-sort-paragraphs, master
a month ago
|
None
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 0c23e55... 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 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)a month ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-sort-paragraphs, master
a month ago
|
None
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 0c23e55... 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 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)2 months ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-sort-paragraphs, master
2 months ago
|
None
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 0c23e55... 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 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)2 months ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-sort-paragraphs, master
2 months ago
|
None
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 0c23e55... 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 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)2 months ago |
None
Repository notification received |
GitHub: https://github.com/otacke/h5p-sort-paragraphs, master
2 months ago
|
None
Repository rebase failed |
Rebasing (1/2) Auto-merging language/nb.json CONFLICT (content): Merge conflict in language/nb.json error: could not apply 0c23e55... 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 0c23e55... Marion Federl <marionf@ndla.no> updated Norwegian Bokmål translation using Weblate @ translate-h5p.tk. (1)2 months ago |