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

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)

8 days 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)

8 days 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)

8 days 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)

8 days ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 8 days 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)

3 weeks ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master 3 weeks 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)

a month ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master a month 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)

a month ago

GitHub: https://github.com/NDLANO/h5p-3d-model, master a month 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)

a month ago

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

The component was automatically locked because of an alert. a month ago

Could not merge the repository. a month 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)

a month ago

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

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

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

Repository rebased

Original revision: 7370b4c066847e38fbea090dfd94810fb5e29505
New revision: 374915c765d472b2e5d6fba66d58c462eb495f4d a month ago