2. H5P
3. h5p-single-choice-set
4. Changes

warning: skipped previously applied commit 886ebfa
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/3)
Rebasing (2/3)
Auto-merging language/he.json
CONFLICT (add/add): Merge conflict in language/he.json
error: could not apply 486e59f... Update translation files
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 486e59f... Update translation files
 (1)

3 months ago

warning: skipped previously applied commit 886ebfa
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/3)
Rebasing (2/3)
Auto-merging language/he.json
CONFLICT (add/add): Merge conflict in language/he.json
error: could not apply 486e59f... Update translation files
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 486e59f... Update translation files
 (1)

3 months ago

The component was automatically locked because of an alert. 3 months ago

Could not merge the repository. 3 months ago

warning: skipped previously applied commit 886ebfa
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/3)
Rebasing (2/3)
Auto-merging language/he.json
CONFLICT (add/add): Merge conflict in language/he.json
error: could not apply 486e59f... Update translation files
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 486e59f... Update translation files
 (1)

3 months ago

Changes committed 7 months ago

Changes committed 7 months ago

English Norwegian Nynorsk 8 characters edited Current translation Translated 7 months ago

Contributor joined 7 months ago

English Norwegian Bokmål 8 characters edited Current translation Translated 7 months ago

Contributor joined 7 months ago

Changes committed 8 months ago

Changes committed 8 months ago

English Norwegian Bokmål 2 characters edited Current translation Approved 8 months ago

English Norwegian Bokmål 2 characters edited Current translation Approved 8 months ago

English Norwegian Nynorsk 7 characters edited Current translation Approved 8 months ago

English Norwegian Bokmål 7 characters edited Current translation Approved 8 months ago

English Norwegian Nynorsk 7 characters edited Current translation Approved 8 months ago

English Norwegian Bokmål 7 characters edited Current translation Approved 8 months ago

English Norwegian Nynorsk 7 characters edited Approved 8 months ago