User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-ndla-timeline, master 6 months ago
User avatar None

Repository rebased

Repository rebased

Original revision: c896431d024386a03892ae8e606ab0d8fafb91ac
New revision: 443e68e48ad0c28f21e0a1f23ea25a9dd930c279 6 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, master 6 months ago
User avatar None

Repository rebased

Repository rebased

Original revision: 43af303a085c192c49860c538c469ad9f4dd3d83
New revision: c896431d024386a03892ae8e606ab0d8fafb91ac 6 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, master 6 months ago
User avatar None

Repository rebased

Repository rebased

Original revision: 7d3380a661035e722b2a396d2497b7a5c759b99c
New revision: 828d9f76203b3d9cb77664c1b6e50d234224595e 6 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-ndla-timeline, master 6 months ago
User avatar None

Repository rebased

Repository rebased

Original revision: fcdc0cf4a70f6923b9e534b78e38ecdedec0f384
New revision: 7d3380a661035e722b2a396d2497b7a5c759b99c 6 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-ndla-timeline, master 6 months ago
User avatar None

Repository rebased

Repository rebased

Original revision: 948cd81d17841a2d9e947d567c10223e3f2c5d3e
New revision: 43af303a085c192c49860c538c469ad9f4dd3d83 6 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-editor-ndla-timeline, master 6 months ago
User avatar kovacsmark

Suggestion added

6 months ago
User avatar kovacsmark

Suggestion added

6 months ago
User avatar None

Repository rebased

Repository rebased

Original revision: 4eeef7281a5a415145dadc0687558c36944b9b1b
New revision: 0c45c930f6f411bc14648241a12e8fcb0cce2143 6 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-phrase-randomizer, master 6 months ago
User avatar None

Repository rebased

Repository rebased

Original revision: 3170e7a4ff99906f12588def2e027d4f582740a2
New revision: 4eeef7281a5a415145dadc0687558c36944b9b1b 6 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-phrase-randomizer, master 6 months ago
User avatar None

Repository rebase failed

Rebasing (1/6)
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
Auto-merging language/bg.json
CONFLICT (content): Merge conflict in language/bg.json
Auto-merging language/ca.json
CONFLICT (content): Merge conflict in language/ca.json
Auto-merging language/cs.json
CONFLICT (content): Merge conflict in language/cs.json
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
Auto-merging language/el.json
CONFLICT (content): Merge conflict in language/el.json
Auto-merging language/es-mx.json
CONFLICT (content): Merge conflict in language/es-mx.json
Auto-merging language/es.json
CONFLICT (content): Merge conflict in language/es.json
Auto-merging language/et.json
CONFLICT (content): Merge conflict in language/et.json
Auto-merging language/eu.json
CONFLICT (content): Merge conflict in language/eu.json
Auto-merging language/fi.json
CONFLICT (content): Merge conflict in language/fi.json
Auto-merging language/fr.json
CONFLICT (content): Merge conflict in language/fr.json
Auto-merging language/gl.json
CONFLICT (content): Merge conflict in language/gl.json
Auto-merging language/it.json
CONFLICT (content): Merge conflict in language/it.json
Auto-merging language/ko.json
CONFLICT (content): Merge conflict in language/ko.json
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Auto-merging language/nl.json
CONFLICT (content): Merge conflict in language/nl.json
Auto-merging language/nn.json
CONFLICT (content): Merge conflict in language/nn.json
Auto-merging language/pt-br.json
CONFLICT (content): Merge conflict in language/pt-br.json
Auto-merging language/sl.json
CONFLICT (content): Merge conflict in language/sl.json
Auto-merging language/sv.json
CONFLICT (content): Merge conflict in language/sv.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging scripts/components/HUD/Buttons/Button/Button.js
CONFLICT (content): Merge conflict in scripts/components/HUD/Buttons/Button/Button.js
Auto-merging scripts/components/Interactions/NavigationButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButton.js
Auto-merging scripts/components/Interactions/OpenContent.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/OpenContent.js
Auto-merging scripts/components/Main.js
CONFLICT (content): Merge conflict in scripts/components/Main.js
Auto-merging scripts/components/Scene/Scene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/Scene.js
Auto-merging scripts/components/Scene/SceneTypes/StaticScene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/StaticScene.js
Auto-merging scripts/components/Scene/SceneTypes/ThreeSixtyScene.js
CONFLICT (modify/delete): scripts/utils/sanitization.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/utils/sanitization.js left in tree.
Auto-merging semantics.json
CONFLICT (content): Merge conflict in semantics.json
error: could not apply 31ece51... Revert "Prepare for release"
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 31ece51... Revert "Prepare for release"
 (1)
6 months ago
User avatar None

Repository notification received

GitHub: https://github.com/NDLANO/h5p-ndla-virtual-tour, master 6 months ago
User avatar None

Repository rebase failed

Rebasing (1/6)
Auto-merging language/.en.json
CONFLICT (content): Merge conflict in language/.en.json
Auto-merging language/bg.json
CONFLICT (content): Merge conflict in language/bg.json
Auto-merging language/ca.json
CONFLICT (content): Merge conflict in language/ca.json
Auto-merging language/cs.json
CONFLICT (content): Merge conflict in language/cs.json
Auto-merging language/de.json
CONFLICT (content): Merge conflict in language/de.json
Auto-merging language/el.json
CONFLICT (content): Merge conflict in language/el.json
Auto-merging language/es-mx.json
CONFLICT (content): Merge conflict in language/es-mx.json
Auto-merging language/es.json
CONFLICT (content): Merge conflict in language/es.json
Auto-merging language/et.json
CONFLICT (content): Merge conflict in language/et.json
Auto-merging language/eu.json
CONFLICT (content): Merge conflict in language/eu.json
Auto-merging language/fi.json
CONFLICT (content): Merge conflict in language/fi.json
Auto-merging language/fr.json
CONFLICT (content): Merge conflict in language/fr.json
Auto-merging language/gl.json
CONFLICT (content): Merge conflict in language/gl.json
Auto-merging language/it.json
CONFLICT (content): Merge conflict in language/it.json
Auto-merging language/ko.json
CONFLICT (content): Merge conflict in language/ko.json
Auto-merging language/nb.json
CONFLICT (content): Merge conflict in language/nb.json
Auto-merging language/nl.json
CONFLICT (content): Merge conflict in language/nl.json
Auto-merging language/nn.json
CONFLICT (content): Merge conflict in language/nn.json
Auto-merging language/pt-br.json
CONFLICT (content): Merge conflict in language/pt-br.json
Auto-merging language/sl.json
CONFLICT (content): Merge conflict in language/sl.json
Auto-merging language/sv.json
CONFLICT (content): Merge conflict in language/sv.json
Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Auto-merging package.json
CONFLICT (content): Merge conflict in package.json
Auto-merging scripts/components/HUD/Buttons/Button/Button.js
CONFLICT (content): Merge conflict in scripts/components/HUD/Buttons/Button/Button.js
Auto-merging scripts/components/Interactions/NavigationButton.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/NavigationButton.js
Auto-merging scripts/components/Interactions/OpenContent.js
CONFLICT (content): Merge conflict in scripts/components/Interactions/OpenContent.js
Auto-merging scripts/components/Main.js
CONFLICT (content): Merge conflict in scripts/components/Main.js
Auto-merging scripts/components/Scene/Scene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/Scene.js
Auto-merging scripts/components/Scene/SceneTypes/StaticScene.js
CONFLICT (content): Merge conflict in scripts/components/Scene/SceneTypes/StaticScene.js
Auto-merging scripts/components/Scene/SceneTypes/ThreeSixtyScene.js
CONFLICT (modify/delete): scripts/utils/sanitization.js deleted in 31ece51 (Revert "Prepare for release") and modified in HEAD.  Version HEAD of scripts/utils/sanitization.js left in tree.
Auto-merging semantics.json
CONFLICT (content): Merge conflict in semantics.json
error: could not apply 31ece51... Revert "Prepare for release"
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 31ece51... Revert "Prepare for release"
 (1)
6 months ago

Search