Fixed merge conflict?

This commit is contained in:
François Autin 2021-06-24 00:01:12 +02:00
parent 2d54c76bc6
commit 0ebc582e40

View File

@ -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);