From 769adeeecaddd2d2dc6ece5f2d2622e56d4ed3a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Heredero?= <remi@heredero.ch>
Date: Fri, 17 Jun 2022 09:05:22 +0200
Subject: [PATCH] fix error of merge

---
 src/Text/FightData.java | 4 ++--
 src/Text/TextEnemy.java | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Text/FightData.java b/src/Text/FightData.java
index be5c7d8..ffd508a 100644
--- a/src/Text/FightData.java
+++ b/src/Text/FightData.java
@@ -12,7 +12,7 @@ public class FightData {
     private  File file;
     private static String regex = ";";
 
-    public int nbre_line =0;
+    public int nbr_line =0;
 
     public FightData(String branch) {
         file = new File("./Data/Battle/Fight/" + branch + ".csv");
@@ -46,7 +46,7 @@ public class FightData {
         
     }
 
-    //return the vector with all attaks of one enemi
+    //return the vector with all attacks of one enemy
     public Vector<Attack> getAllAttacks(){
         return attacks;
     }
diff --git a/src/Text/TextEnemy.java b/src/Text/TextEnemy.java
index 35a336c..d7001d4 100644
--- a/src/Text/TextEnemy.java
+++ b/src/Text/TextEnemy.java
@@ -2,7 +2,6 @@ package Text;
 
 import Entity.Enemy;
 import java.util.Vector;
-import java.util.Arrays;
 import java.util.Random;
 
 public class TextEnemy {
@@ -79,7 +78,7 @@ public class TextEnemy {
             int[] currentRandom = new int[5];
             currentRandom[0] = orderAttack[j];
 
-            //generate a random array to determin the order of the answer
+            //generate a random array to determine the order of the answer
             orderAnswer = randomGenerate(0, 3, 4);
 
             //save the order of answer and attack