2. H5P
3. h5p-tabs
4. Changes

The “language/sv.json” file was changed. 11 months ago

Repository rebased

Original revision: 242f8eb0ba43fb1bbed9179cab5cc088e2a4ce10
New revision: 1a55eb926c92b28fa487515eeeae3d7158f64bbe 11 months ago

GitHub: https://github.com/otacke/h5p-tabs, master 11 months ago

Fixing an alert automatically unlocked the component. 11 months ago

Rebasing (1/2)
error: could not apply 9e212b7... Anonymous <noreply@weblate.org> updated Swedish 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 9e212b7... Anonymous <noreply@weblate.org> updated Swedish translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/sv.json
Auto-merging language/sv.json
 (1)

a year ago

GitHub: https://github.com/otacke/h5p-tabs, master a year ago

Rebasing (1/2)
error: could not apply 9e212b7... Anonymous <noreply@weblate.org> updated Swedish 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 9e212b7... Anonymous <noreply@weblate.org> updated Swedish translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/sv.json
Auto-merging language/sv.json
 (1)

a year ago

Rebasing (1/2)
error: could not apply 9e212b7... Anonymous <noreply@weblate.org> updated Swedish 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 9e212b7... Anonymous <noreply@weblate.org> updated Swedish translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/sv.json
Auto-merging language/sv.json
 (1)

a year ago

Rebasing (1/2)
error: could not apply 9e212b7... Anonymous <noreply@weblate.org> updated Swedish 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 9e212b7... Anonymous <noreply@weblate.org> updated Swedish translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/sv.json
Auto-merging language/sv.json
 (1)

a year ago

Rebasing (1/2)
error: could not apply 9e212b7... Anonymous <noreply@weblate.org> updated Swedish 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 9e212b7... Anonymous <noreply@weblate.org> updated Swedish translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/sv.json
Auto-merging language/sv.json
 (1)

a year ago

Rebasing (1/2)
error: could not apply 9e212b7... Anonymous <noreply@weblate.org> updated Swedish 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 9e212b7... Anonymous <noreply@weblate.org> updated Swedish translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/sv.json
Auto-merging language/sv.json
 (1)

a year ago

The component was automatically locked because of an alert. a year ago

Could not merge the repository. a year ago

Rebasing (1/2)
error: could not apply 9e212b7... Anonymous <noreply@weblate.org> updated Swedish 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 9e212b7... Anonymous <noreply@weblate.org> updated Swedish translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/sv.json
Auto-merging language/sv.json
 (1)

a year ago

GitHub: https://github.com/otacke/h5p-tabs, master a year ago

Repository rebased a year ago

GitHub: https://github.com/otacke/h5p-tabs, master a year ago

Changes pushed a year ago

Repository rebased a year ago

GitHub: https://github.com/otacke/h5p-tabs, master a year ago