User avatar deepbluev7

Repository rebase failed

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)
7 months ago
User avatar None

Changes committed

Changes committed 9 months ago
User avatar recurser

Suggestion accepted

9 months ago
User avatar anonymous

Suggestion added

9 months ago
User avatar None

Repository rebased

Repository rebased

Original revision: dcc632219547a2cf66c11f963c50a4c042daec06
New revision: 4bed0fc2f996396b4984f26b7ad18ffda93770c0 9 months ago
User avatar mt:weblate

Suggestion added

9 months ago
User avatar mt:weblate

Suggestion added

9 months ago
User avatar mt:weblate

Suggestion added

9 months ago
User avatar mt:weblate

Suggestion added

9 months ago
User avatar mt:weblate

Suggestion added

9 months ago
User avatar mt:weblate

Suggestion added

9 months ago
User avatar mt:weblate

Suggestion added

9 months ago
User avatar mt:weblate

Suggestion added

9 months ago
User avatar mt:weblate

Suggestion added

9 months ago
User avatar mt:weblate

Suggestion added

9 months ago
User avatar mt:weblate

Suggestion added

9 months ago
User avatar None

Repository rebased

Repository rebased

Original revision: 59fa3a65ce036e35f80cb36127dd0e8eac47552a
New revision: dcc632219547a2cf66c11f963c50a4c042daec06 9 months ago
User avatar None

Changes committed

Changes committed 9 months ago
User avatar thesofafox

Suggestion added

9 months ago
User avatar thesofafox

Suggestion accepted

9 months ago

Search