 otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
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
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|
|
otacke
Changes pushed |
Changes pushed
3 years ago
|