User avatar deepbluev7

Repository rebased

  1. Nheko
  2. nheko
Repository rebased

Original revision: 3baaaf41ba3bbb7a7161f0e234e17eb83415a356
New revision: 72dcd874203c6044f48217e7b33ebc4410e652dd 5 months ago
User avatar None

Component locked

  1. Nheko
  2. nheko
The component was automatically locked because of an alert. 5 months ago
User avatar None

Alert triggered

  1. Nheko
  2. nheko
Could not merge the repository. 5 months ago
User avatar deepbluev7

Repository rebase failed

  1. Nheko
  2. nheko
 
Rebasing (1/4)
Rebasing (2/4)
Auto-merging resources/langs/nheko_fi.ts
CONFLICT (content): Merge conflict in resources/langs/nheko_fi.ts
error: could not apply 9cb8882d... Translated using Weblate (Finnish)
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 9cb8882d... Translated using Weblate (Finnish)
 (1)
5 months ago

Search