2. H5P
3. h5p-editor-ndla-timeline
4. Changes

Rebasing (1/1)
error: could not apply 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque 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 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/eu.json
Auto-merging language/eu.json
 (1)

a year ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, main a year ago

Rebasing (1/1)
error: could not apply 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque 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 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/eu.json
Auto-merging language/eu.json
 (1)

a year ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, main a year ago

Rebasing (1/1)
error: could not apply 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque 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 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/eu.json
Auto-merging language/eu.json
 (1)

a year ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, main a year ago

Repository outdated. a year ago

Rebasing (1/1)
error: could not apply 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque 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 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/eu.json
Auto-merging language/eu.json
 (1)

a year ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, main a year ago

Rebasing (1/1)
error: could not apply 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque 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 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/eu.json
Auto-merging language/eu.json
 (1)

a year ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, main a year ago

Rebasing (1/1)
error: could not apply 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque 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 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/eu.json
Auto-merging language/eu.json
 (1)

a year ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, main 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/1)
error: could not apply 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque 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 5c142d9... Alex Gabilondo <alexgabi@disroot.org> updated Basque translation using Weblate @ translate-h5p.tk.
CONFLICT (add/add): Merge conflict in language/eu.json
Auto-merging language/eu.json
 (1)

a year ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, main a year ago

English Basque 6 characters edited Translated a year ago

English Basque 6 characters edited Translated a year ago

English Basque 3 characters edited Current translation Translated a year ago