2. H5P
3. h5p-combination-lock
4. Changes

Rebasing (1/2)
Rebasing (2/2)
Auto-merging language/lt.json
CONFLICT (content): Merge conflict in language/lt.json
error: could not apply 6996556... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
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 6996556... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)

a month ago

GitHub: https://github.com/otacke/h5p-combination-lock, master a month ago

Rebasing (1/2)
Rebasing (2/2)
Auto-merging language/lt.json
CONFLICT (content): Merge conflict in language/lt.json
error: could not apply 6996556... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
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 6996556... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)

a month ago

GitHub: https://github.com/otacke/h5p-combination-lock, master a month ago

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

Could not merge the repository. a month ago

Rebasing (1/2)
Rebasing (2/2)
Auto-merging language/lt.json
CONFLICT (content): Merge conflict in language/lt.json
error: could not apply 6996556... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
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 6996556... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)

a month ago

GitHub: https://github.com/otacke/h5p-combination-lock, master a month ago

Repository rebased

Original revision: 01a52b70b74bbb4bf836aee792ae1de9ab39be98
New revision: 69965561d0c48f82361ed3e234ac59f66f68e7c3 a month ago

GitHub: https://github.com/otacke/h5p-combination-lock, master a month ago

Repository rebased

Original revision: 66265418c461998b5f60ffd05ade1b18aed27894
New revision: 01a52b70b74bbb4bf836aee792ae1de9ab39be98 a month ago

GitHub: https://github.com/otacke/h5p-combination-lock, master a month ago

Repository rebased

Original revision: d3f4bf13c157964e13d4a0d90e96f83d17e4cd61
New revision: 66265418c461998b5f60ffd05ade1b18aed27894 a month ago

GitHub: https://github.com/otacke/h5p-combination-lock, master a month ago

Repository rebased

Original revision: 0603dcda106f7fcd7da43dfec423ce7860eb629e
New revision: d3f4bf13c157964e13d4a0d90e96f83d17e4cd61 a month ago

GitHub: https://github.com/otacke/h5p-combination-lock, master a month ago