Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge conflict commmited to repo #189

Open
andrewnicols opened this issue Sep 26, 2024 · 2 comments
Open

Merge conflict commmited to repo #189

andrewnicols opened this issue Sep 26, 2024 · 2 comments

Comments

@andrewnicols
Copy link
Contributor

The file at /fonts/h5p-core-29.svg contains a merge conflict.

https://github.com/h5p/h5p-php-library/blob/master/fonts/h5p-core-29.svg
@andrewnicols
Copy link
Contributor Author

Code source: https://github.com/h5p/h5p-php-library/blob/master/fonts/h5p-core-29.svg?short_path=7c1f4bc

@sarjona
Copy link

sarjona commented Sep 26, 2024

Looking at the patch in f5d27a5 (where this file was updated), it seems it should be removed, because now styles/h5p.css is using h5p-core-30.* fonts

It would be great if it could be confirmed by any H5P developer ;-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@andrewnicols @sarjona