2. H5P
3. h5p-game-map
4. Changes

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

2 months ago

GitHub: https://github.com/otacke/h5p-game-map, master 2 months ago

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

2 months ago

GitHub: https://github.com/otacke/h5p-game-map, master 2 months ago

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

3 months ago

GitHub: https://github.com/otacke/h5p-game-map, master 3 months ago

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

3 months ago

GitHub: https://github.com/otacke/h5p-game-map, master 3 months ago

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

3 months ago

GitHub: https://github.com/otacke/h5p-game-map, master 3 months ago

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

3 months ago

GitHub: https://github.com/otacke/h5p-game-map, master 3 months ago

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

3 months ago

GitHub: https://github.com/otacke/h5p-game-map, master 3 months ago