summaryrefslogtreecommitdiff
path: root/engine/overworld/player_animations.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/overworld/player_animations.asm')
-rwxr-xr-xengine/overworld/player_animations.asm1
1 files changed, 0 insertions, 1 deletions
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 05be3d1d..6488eaac 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -414,7 +414,6 @@ FishingAnim: ; 70816 (1c:4816)
ld a, [wRodResponse]
and a
ld hl, NoNibbleText
-<<<<<<< HEAD
jr z, .done
cp $2
ld hl, NothingHereText