2. Changes

Repository rebased a year ago

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

Repository rebased a year ago

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

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

a year ago

GitHub: https://github.com/otacke/h5p-editor-portfolio-placeholder, master a year ago

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

a year ago

GitHub: https://github.com/otacke/h5p-editor-portfolio-placeholder, master a year ago

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

a year ago

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

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

a year ago

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

Repository rebased a year ago

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

Repository rebased a year ago

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

Repository rebased a year ago

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

Repository rebased a year ago

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