2. AlekSIS
3. AlekSIS-Core-Frontend
4. Änderungen

Rebasing (1/1)
error: could not apply 6727f2a4... Translated using Weblate (German)
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 6727f2a4... Translated using Weblate (German)
Auto-merging aleksis/core/frontend/messages/de.json
CONFLICT (content): Merge conflict in aleksis/core/frontend/messages/de.json
 (1)

vor 4 Monaten

GitLab: https://edugit.org/AlekSIS/official/AlekSIS-Core, master vor 4 Monaten

Rebasing (1/1)
error: could not apply 6727f2a4... Translated using Weblate (German)
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 6727f2a4... Translated using Weblate (German)
Auto-merging aleksis/core/frontend/messages/de.json
CONFLICT (content): Merge conflict in aleksis/core/frontend/messages/de.json
 (1)

vor 4 Monaten

GitLab: https://edugit.org/AlekSIS/official/AlekSIS-Core, master vor 4 Monaten

Rebasing (1/1)
error: could not apply 6727f2a4... Translated using Weblate (German)
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 6727f2a4... Translated using Weblate (German)
Auto-merging aleksis/core/frontend/messages/de.json
CONFLICT (content): Merge conflict in aleksis/core/frontend/messages/de.json
 (1)

vor 4 Monaten

GitLab: https://edugit.org/AlekSIS/official/AlekSIS-Core, master vor 4 Monaten

Rebasing (1/1)
error: could not apply 6727f2a4... Translated using Weblate (German)
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 6727f2a4... Translated using Weblate (German)
Auto-merging aleksis/core/frontend/messages/de.json
CONFLICT (content): Merge conflict in aleksis/core/frontend/messages/de.json
 (1)

vor 4 Monaten

GitLab: https://edugit.org/AlekSIS/official/AlekSIS-Core, master vor 4 Monaten

Rebasing (1/1)
error: could not apply 6727f2a4... Translated using Weblate (German)
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 6727f2a4... Translated using Weblate (German)
Auto-merging aleksis/core/frontend/messages/de.json
CONFLICT (content): Merge conflict in aleksis/core/frontend/messages/de.json
 (1)

vor 4 Monaten

GitLab: https://edugit.org/AlekSIS/official/AlekSIS-Core, master vor 4 Monaten

Rebasing (1/1)
error: could not apply 6727f2a4... Translated using Weblate (German)
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 6727f2a4... Translated using Weblate (German)
Auto-merging aleksis/core/frontend/messages/de.json
CONFLICT (content): Merge conflict in aleksis/core/frontend/messages/de.json
 (1)

vor 4 Monaten

GitLab: https://edugit.org/AlekSIS/official/AlekSIS-Core, master vor 4 Monaten

Rebasing (1/1)
error: could not apply 6727f2a4... Translated using Weblate (German)
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 6727f2a4... Translated using Weblate (German)
Auto-merging aleksis/core/frontend/messages/de.json
CONFLICT (content): Merge conflict in aleksis/core/frontend/messages/de.json
 (1)

vor 4 Monaten

GitLab: https://edugit.org/AlekSIS/official/AlekSIS-Core, master vor 4 Monaten

Rebasing (1/1)
error: could not apply 6727f2a4... Translated using Weblate (German)
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 6727f2a4... Translated using Weblate (German)
Auto-merging aleksis/core/frontend/messages/de.json
CONFLICT (content): Merge conflict in aleksis/core/frontend/messages/de.json
 (1)

vor 4 Monaten

GitLab: https://edugit.org/AlekSIS/official/AlekSIS-Core, master vor 4 Monaten

Rebasing (1/1)
error: could not apply 6727f2a4... Translated using Weblate (German)
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 6727f2a4... Translated using Weblate (German)
Auto-merging aleksis/core/frontend/messages/de.json
CONFLICT (content): Merge conflict in aleksis/core/frontend/messages/de.json
 (1)

vor 4 Monaten

GitLab: https://edugit.org/AlekSIS/official/AlekSIS-Core, master vor 4 Monaten

Rebasing (1/1)
error: could not apply 6727f2a4... Translated using Weblate (German)
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 6727f2a4... Translated using Weblate (German)
Auto-merging aleksis/core/frontend/messages/de.json
CONFLICT (content): Merge conflict in aleksis/core/frontend/messages/de.json
 (1)

vor 4 Monaten

GitLab: https://edugit.org/AlekSIS/official/AlekSIS-Core, master vor 4 Monaten