reglage du conflit git

P4A/src/p4a/ArrayListStd.java

@@ -8,11 +8,7 @@ public class ArrayListStd<E> extends ArrayList<E> implements Structure{
 	
 	public ArrayListStd()
 	{
-<<<<<<< HEAD
-		liste = new ArrayListStd<E>();
-=======
 		liste = new ArrayList<E>();
->>>>>>> b0eb80a19a87220e9305a3913f8b3e966756c014
 	}
 	
 	@Override

P4A/src/p4a/LinkedListStd.java

@@ -8,11 +8,7 @@ private LinkedList<E> liste;
 	
 	public LinkedListStd()
 	{
-<<<<<<< HEAD
-		liste = new LinkedListStd<E>();
-=======
 		liste = new LinkedList<E>();
->>>>>>> b0eb80a19a87220e9305a3913f8b3e966756c014
 	}
 	
 	@Override