correction de bug

P4A/src/p4a/MainLinkedListStdRemoveFirstValue.java

@@ -2,7 +2,6 @@ package p4a;
 
 public class MainLinkedListStdRemoveFirstValue {
 	public static void main(String[] args) {
-<<<<<<< HEAD
 		ArrayListStd<Integer> arrayList = new ArrayListStd<Integer>();
 		int nbOperation = Integer.parseInt(args[0]);
 		
@@ -11,16 +10,6 @@ public class MainLinkedListStdRemoveFirstValue {
 		}
 		for (int i = 0; i < nbOperation; i++) {
 			arrayList.suppression(0);
-=======
-		LinkedListStd<Integer> linkedListStd = new LinkedListStd<Integer>();
-		int nbOperation = Integer.parseInt(args[0]);
-		
-		for (int i = 0; i < nbOperation; i++) {
-			linkedListStd.ajout(0, i);
-		}
-		for (int i = 0; i < nbOperation; i++) {
-			linkedListStd.suppression(0);
->>>>>>> af571803536d0b71fa91c1f897612b43608d9bbd
 		}
 	}
 }