2. H5P
3. h5p-game-map
4. Changes

Rebasing (1/1)
error: could not apply 1166443... Add CSS workarounds for Safari < 14.5
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1166443... Add CSS workarounds for Safari < 14.5
Auto-merging src/scripts/components/toolbar/status-containers/status-container.scss
CONFLICT (content): Merge conflict in src/scripts/components/toolbar/status-containers/status-container.scss
 (1)

10 months ago

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

Rebasing (1/1)
error: could not apply 1166443... Add CSS workarounds for Safari < 14.5
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1166443... Add CSS workarounds for Safari < 14.5
Auto-merging src/scripts/components/toolbar/status-containers/status-container.scss
CONFLICT (content): Merge conflict in src/scripts/components/toolbar/status-containers/status-container.scss
 (1)

10 months ago

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

Rebasing (1/1)
error: could not apply 1166443... Add CSS workarounds for Safari < 14.5
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1166443... Add CSS workarounds for Safari < 14.5
Auto-merging src/scripts/components/toolbar/status-containers/status-container.scss
CONFLICT (content): Merge conflict in src/scripts/components/toolbar/status-containers/status-container.scss
 (1)

10 months ago

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

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

Could not merge the repository. 10 months ago

Rebasing (1/1)
error: could not apply 1166443... Add CSS workarounds for Safari < 14.5
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 1166443... Add CSS workarounds for Safari < 14.5
Auto-merging src/scripts/components/toolbar/status-containers/status-container.scss
CONFLICT (content): Merge conflict in src/scripts/components/toolbar/status-containers/status-container.scss
 (1)

10 months ago

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

Repository rebased 10 months ago

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

Repository rebased 10 months ago

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

Repository rebased 10 months ago

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

The “language/zh.json” file was changed. 10 months ago

English Chinese (no variant code) (zh) 13 characters edited Translated 10 months ago

English Chinese (no variant code) (zh) 5 characters edited Translated 10 months ago

English Chinese (no variant code) (zh) 11 characters edited Translated 10 months ago