User avatar None

Repository rebase failed

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
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 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)
11 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-agamotto, master 11 months ago
User avatar None

Repository rebase failed

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
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 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)
11 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-agamotto, master 11 months ago
User avatar None

Repository rebase failed

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
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 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)
11 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-agamotto, master 11 months ago
User avatar None

Repository rebase failed

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
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 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)
11 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-agamotto, master 11 months ago
User avatar None

Repository rebase failed

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
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 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)
11 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-agamotto, master 11 months ago
User avatar None

Repository rebase failed

Rebasing (1/2)
Auto-merging src/scripts/h5p-agamotto.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto.js
error: could not apply 1b5e8a5... HFP-3880 Fix audio playing even though muted
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 1b5e8a5... HFP-3880 Fix audio playing even though muted
 (1)
11 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-agamotto, master 11 months ago
User avatar None

Component locked

The component was automatically locked because of an alert. 11 months ago
User avatar None

Alert triggered

Could not merge the repository. 11 months ago
User avatar None

Repository rebase failed

Rebasing (1/1)
Auto-merging src/scripts/h5p-agamotto-slider.js
CONFLICT (content): Merge conflict in src/scripts/h5p-agamotto-slider.js
error: could not apply a3c0ad3... HFP-3880 Fix slider drag positioning
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 a3c0ad3... HFP-3880 Fix slider drag positioning
 (1)
11 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-agamotto, master 11 months ago
User avatar None

Repository rebased

Repository rebased

Original revision: f2ed8ab410d36aa79cfe8301fd178116480fb974
New revision: a3c0ad38d09f4b682e6015008d8ebe8b6e5282dc 11 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-agamotto, master 11 months ago
User avatar None

Repository rebased

Repository rebased

Original revision: 4cf55161f8b3148365f88e1a35193605eb585ddc
New revision: f2ed8ab410d36aa79cfe8301fd178116480fb974 11 months ago
User avatar None

Repository notification received

GitHub: https://github.com/otacke/h5p-agamotto, master 11 months ago

Search