2. Changes

The “language/es.json” file was changed. 9 months ago

The “language/es-mx.json” file was changed. 9 months ago

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

The “language/cs.json” file was changed. 9 months ago

Repository rebased

Original revision: 59c08d75aa37dc06ec8e5acf0222646602851763
New revision: 2137bcec8b47c97ab1f9933bde1ff3fe821dd1c3 9 months ago

GitHub: https://github.com/NDLANO/h5p-ndla-virtual-tour, master 9 months ago

Repository rebased

Original revision: 4a72ff4b251fed546486a1c37b6cb337c2844221
New revision: 92a5721a744abedf4511df15db9ec274de1f59a6 9 months ago

GitHub: https://github.com/Lumieducation/H5P-Nodejs-library, master 9 months ago

GitHub: https://github.com/NDLANO/h5p-ndla-virtual-tour, master 9 months ago

Fixing an alert automatically unlocked the component. 9 months ago

Repository rebased

Original revision: 9af4424db2d4ec819765eea510cd5e19c64f78f4
New revision: 59c08d75aa37dc06ec8e5acf0222646602851763 9 months ago

GitHub: https://github.com/NDLANO/h5p-ndla-virtual-tour, master 9 months ago

Repository rebased

Original revision: 2ff6b952a4939a5277e4bc0c10d2b1c18e9df2b1
New revision: 1a5a1f542b790a7a29a7c7bab994da4276c53385 9 months ago

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

warning: skipped previously applied commit 3242db8
warning: skipped previously applied commit b08bcb2
warning: skipped previously applied commit ac7dda3
warning: skipped previously applied commit ddba6ca
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging language/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
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 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)

9 months ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-virtual-tour, master 9 months ago

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

Could not merge the repository. 9 months ago

warning: skipped previously applied commit 3242db8
warning: skipped previously applied commit b08bcb2
warning: skipped previously applied commit ac7dda3
warning: skipped previously applied commit ddba6ca
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging language/lt.json
CONFLICT (add/add): Merge conflict in language/lt.json
error: could not apply 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
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 2e0d2a1... Gintarė <gintare.lose@ktu.lt> updated Lithuanian translation using Weblate @ translate-h5p.tk.
 (1)

9 months ago

GitHub: https://github.com/NDLANO/h5p-editor-ndla-virtual-tour, master 9 months ago