fixed self merge

pret · Jan 18, 2025 · 6eb7f3c · 6eb7f3c
1 parent ee69252
commit 6eb7f3c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
@@ -851,11 +851,7 @@ static u8 GetWaterEncounterSlot(void)
         return 1;
     } else if (roll >= 90 && roll < 95) {
         return 2;
-<<<<<<< HEAD
     } else if (roll >= 95 && roll < 99) {
-=======
-    } else if (roll >= 95 roll < 99) {
->>>>>>> c86cf1547103c43f66b1811b2d5edb88f166a0f7
         return 3;
     }