2. H5P
3. h5p-editor-phrase-randomizer
4. Changes

Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Auto-merging language/de.json
CONFLICT (add/add): Merge conflict in language/de.json
error: could not apply ada62c9... 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 ada62c9... Update translation files
 (1)

3 weeks ago

GitHub: https://github.com/otacke/h5p-editor-phrase-randomizer, master 3 weeks ago

Rebasing (1/3)
Rebasing (2/3)
Rebasing (3/3)
Auto-merging language/de.json
CONFLICT (add/add): Merge conflict in language/de.json
error: could not apply ada62c9... 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 ada62c9... Update translation files
 (1)

a month ago

GitHub: https://github.com/otacke/h5p-editor-phrase-randomizer, master a month ago