2. H5P
3. h5p-3d-model
4. Changes

GitHub: https://github.com/NDLANO/h5p-3d-model, master 4 months ago

Rebasing (1/6)
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
Auto-merging src/scripts/components/threed-model-view.js
error: could not apply d7ad6e6... Add minimum height option
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 d7ad6e6... Add minimum height option
 (1)

4 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 4 months ago

Rebasing (1/6)
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
Auto-merging src/scripts/components/threed-model-view.js
error: could not apply d7ad6e6... Add minimum height option
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 d7ad6e6... Add minimum height option
 (1)

5 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 5 months ago

Rebasing (1/6)
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
error: could not apply d7ad6e6... Add minimum height option
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 d7ad6e6... Add minimum height option
 (1)

5 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 5 months ago

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

Could not merge the repository. 5 months ago

Rebasing (1/6)
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
error: could not apply d7ad6e6... Add minimum height option
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 d7ad6e6... Add minimum height option
 (1)

5 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 5 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 5 months ago

language/.en.json: JSONDecodeError('Expecting property name enclosed in double quotes: line 68 column 9 (char 2190)') 5 months ago

Repository rebased

Original revision: 7370b4c066847e38fbea090dfd94810fb5e29505
New revision: 374915c765d472b2e5d6fba66d58c462eb495f4d 5 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 5 months ago

The “language/de.json” file was changed. 5 months ago

Repository rebased

Original revision: 315a40f01e199f801acc55575af9a1f8399bf39c
New revision: 7370b4c066847e38fbea090dfd94810fb5e29505 5 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 5 months ago

Repository rebased

Original revision: 53b6d59ebe3131f6bb7f70e80efe6356fb2153d7
New revision: 315a40f01e199f801acc55575af9a1f8399bf39c 5 months ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 5 months ago