User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar marionf

Suggestion accepted

a month ago
User avatar None

Repository rebased

Repository rebased

Original revision: d095ce69e95c9088481ab97bc8adf1ef93a22330
New revision: ec803686358f1290c3558f4b5519c7824df456f5 a month ago
User avatar None

Repository notification received

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

Repository rebased

Repository rebased

Original revision: 4c7aa9471d9ecda0d219aa3b0d21d66624bb5a64
New revision: d095ce69e95c9088481ab97bc8adf1ef93a22330 a month ago
User avatar None

Repository notification received

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

Repository rebase failed

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)
a month ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-crossword, master a month ago
User avatar None

Repository rebase failed

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)
a month ago

Search