 otacke
Resource updated |
|
|
otacke
Repository rebased |
Repository rebased
3 years ago
|
|
otacke
Repository rebased |
Repository rebased
3 years ago
|
|
otacke
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Nikola Glišić <glisapn@yahoo.com> updated Serbian translation using Weblate @ translate-h5p.tk. Using index info to reconstruct a base tree... M language/sr.json Falling back to patching base and 3-way merge... Auto-merging language/sr.json CONFLICT (content): Merge conflict in language/sr.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Nikola Glišić <glisapn@yahoo.com> updated Serbian 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". (1)3 years ago |
|
otacke
Resource updated |
The “
language/tr.json” file was changed.
3 years ago
|
|
otacke
Repository rebased |
Repository rebased
3 years ago
|
|
otacke
Repository rebased |
Repository rebased
3 years ago
|
|
otacke
Resource updated |
The “
language/th.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/smj.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/sme.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/sma.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/sl.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/ru.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/nl.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/nb.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/ko.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/it.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/gl.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/fi.json” file was changed.
3 years ago
|
|
otacke
Resource updated |
The “
language/fa.json” file was changed.
3 years ago
|
language/fi.json” file was changed. 3 years ago