User avatar None

Repository rebase failed

  1. H5P
  2. h5p-agamotto
 
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)
a month ago
User avatar None

Repository notification received

  1. H5P
  2. h5p-agamotto
GitHub: https://github.com/otacke/h5p-agamotto, master a month ago

Search