Commit for PR

jamesbrq · Jan 22, 2024 · d0e7d65 · d0e7d65
1 parent 77bb3c3
commit d0e7d65
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -58,11 +58,8 @@ Currently, the following games are supported:
 * Heretic
 * Landstalker: The Treasures of King Nole
 * Final Fantasy Mystic Quest
-<<<<<<< Updated upstream
 * TUNIC
-=======
 * Mario & Luigi: Superstar Saga
->>>>>>> Stashed changes
 
 For setup and instructions check out our [tutorials page](https://archipelago.gg/tutorial/).
 Downloads can be found at [Releases](https://github.com/ArchipelagoMW/Archipelago/releases), including compiled