2. H5P
3. Changes

Repository rebased

Original revision: 41d8683be0204671122d9dca8bef0a385c5727a5
New revision: 5c58318b57e6caa7cfa48473bebbc30c928b20d2 4 months ago

GitHub: https://github.com/otacke/h5p-image-juxtaposition, master 4 months ago

warning: skipped previously applied commit c00e758
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging src/scripts/h5p-crossword.js
CONFLICT (content): Merge conflict in src/scripts/h5p-crossword.js
error: could not apply 6b47020... Fix H5P contract before attached
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 6b47020... Fix H5P contract before attached
 (1)

4 months ago

GitHub: https://github.com/otacke/h5p-crossword, master 4 months ago

Repository rebased

Original revision: 1862e74ab10f0e6b783e64e1434505cb37db52c2
New revision: 6923b9e55f1fae16211837960f97e69262ffc308 4 months ago

GitHub: https://github.com/otacke/h5p-kewar-code, master 4 months ago

Repository rebased

Original revision: 04e6221b042bc6acf6f3953e9a2becabe7442577
New revision: 1862e74ab10f0e6b783e64e1434505cb37db52c2 4 months ago

GitHub: https://github.com/otacke/h5p-kewar-code, master 4 months ago

Repository rebased

Original revision: c2acf7a53d28c7548544edd39672499d2d49abd1
New revision: 04e6221b042bc6acf6f3953e9a2becabe7442577 4 months ago

GitHub: https://github.com/otacke/h5p-kewar-code, master 4 months ago

warning: skipped previously applied commit c00e758
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging src/scripts/h5p-crossword.js
CONFLICT (content): Merge conflict in src/scripts/h5p-crossword.js
error: could not apply 6b47020... Fix H5P contract before attached
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 6b47020... Fix H5P contract before attached
 (1)

4 months ago

GitHub: https://github.com/otacke/h5p-crossword, master 4 months ago

English Lithuanian 2 characters edited 4 months ago

Changes committed 4 months ago

Repository rebased

Original revision: f4c6cf80ebcf2ac866ec59a0b8d473767a297cf3
New revision: 41d8683be0204671122d9dca8bef0a385c5727a5 4 months ago

GitHub: https://github.com/otacke/h5p-image-juxtaposition, master 4 months ago

Changes committed 4 months ago

Changes committed 4 months ago

Repository rebased

Original revision: e328038c398c0f98b18346facb00cf44cea13e95
New revision: 4daf0a77f5f8937c6bee7c313fd64038f139ba53 4 months ago

GitHub: https://github.com/NDLANO/h5p-topic-map, master 4 months ago