 None
Repository rebase failed |
a month ago
|
|
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-3d-model, master
a month ago
|
|
None
Repository rebase failed |
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 |
|
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-3d-model, master
a month ago
|
|
None
Repository rebase failed |
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 |
|
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-3d-model, master
a month ago
|
|
None
Repository rebase failed |
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 |
|
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-3d-model, master
a month ago
|
|
None
Repository rebase failed |
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 |
|
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-3d-model, master
a month ago
|
|
None
Repository rebase failed |
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 |
|
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-3d-model, master
a month ago
|
|
None
Repository rebase failed |
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 |
|
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-3d-model, master
a month ago
|
 otacke
Repository rebase failed |
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 months ago |
|
otacke
Repository rebase failed |
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 months ago |
|
otacke
Repository rebase failed |
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 months ago |
|
None
Repository rebase failed |
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 months ago |
|
None
Repository notification received |
GitHub: https://github.com/NDLANO/h5p-3d-model, master
3 months ago
|
|
None
Repository rebase failed |
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 months ago |