User avatar sushumna

Repository rebase failed

  1. H5P
  2. h5p-cornell
 
Rebasing (1/4)
Rebasing (2/4)
error: could not apply 68e3409... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian 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 68e3409... Matīss Sīlis <matiss.silis@gmail.com> updated Latvian translation using Weblate @ translate-h5p.tk.
Auto-merging language/lv.json
CONFLICT (content): Merge conflict in language/lv.json
 (1)
a year ago

Search