From 0ebc582e4021373df73148718f0e5320734851d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Autin?=
 <francois.autin@etudiant.univ-rennes1.fr>
Date: Thu, 24 Jun 2021 00:01:12 +0200
Subject: [PATCH] Fixed merge conflict?

---
 src/gameplay/Characters/Blue/BlueBaseFrames.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gameplay/Characters/Blue/BlueBaseFrames.java b/src/gameplay/Characters/Blue/BlueBaseFrames.java
index 849f43e..192de90 100644
--- a/src/gameplay/Characters/Blue/BlueBaseFrames.java
+++ b/src/gameplay/Characters/Blue/BlueBaseFrames.java
@@ -1022,7 +1022,7 @@ public class BlueBaseFrames {
                 String path = "textures/Sprite_sans_grille_9comp.png";
                 String pathToBG = "textures/arena1.png";
 
-                Frame f = BlueNormals.ForwardDFrame0();
+                Frame f = BlueNormals.crouchAFrame1();
 
 
                 ObjectGl blue = new ObjectGl(0f, 138f, 138f, 5f, path, null);