oops lol

HarbourMasters · Jan 4, 2025 · 0c99880 · 0c99880
1 parent 66a698a
commit 0c99880
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/mm/2s2h/GameInteractor/GameInteractor.h b/mm/2s2h/GameInteractor/GameInteractor.h
@@ -81,14 +81,11 @@ typedef enum {
     VB_BE_HOOKSHOT_SURFACE,
     VB_DEKU_GUARD_SHOW_SEARCH_BALLS,
     VB_DISPLAY_SONG_OF_DOUBLE_TIME_PROMPT,
-<<<<<<< HEAD
     VB_GIBDO_TRADE_SEQUENCE_SUFFICIENT_QUANTITY_PRESENTED,
     VB_GIBDO_TRADE_SEQUENCE_ACCEPT_RED_POTION,
     VB_GIBDO_TRADE_SEQUENCE_TAKE_MORE_THAN_ONE_ITEM,
     VB_GIBDO_TRADE_SEQUENCE_DO_TRADE,
-=======
     VB_ALLOW_SONG_DOUBLE_TIME_ON_FINAL_NIGHT
->>>>>>> develop
 } GIVanillaBehavior;
 
 typedef enum {