Skip to content

Conversation

@julthep
Copy link
Contributor

@julthep julthep commented Apr 19, 2025

Minor update: insert link for Opera

Minor update: insert link for Opera
@LibretroAdmin
Copy link
Contributor

Hi, can you resolve the merge conflict?

Minor rollback to resolve conflict
@julthep
Copy link
Contributor Author

julthep commented Apr 24, 2025

Hi, can you resolve the merge conflict?

The merge conflict has been resolved.

@fpscan fpscan merged commit b22b6e1 into libretro:master Apr 24, 2025
@julthep julthep deleted the patch-2 branch April 25, 2025 03:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants