Commit 20422ef8 authored by TwistedUmbrella's avatar TwistedUmbrella
Browse files

Remove a merge conflict generated on Github

parent 75c2ae1e
......@@ -37,7 +37,6 @@ Translations
New and updated translations are always appreciated!
All we ask is that you not use “regional” phrases that may not be generally understood.
>>>>>>> dea890e... Update README to include information about translating
Beta versions
-------------
Compiled test versions are available at reicast.loungekatt.com
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment