From ea26d06f84c31fd8eee222d5766deb22708be081 Mon Sep 17 00:00:00 2001
From: Julien Dubocage <jdubocage@etu.unistra.fr>
Date: Thu, 18 Feb 2021 14:54:03 +0100
Subject: [PATCH] reglage du conflit git
---
P4A/src/p4a/ArrayListStd.java | 4 ----
P4A/src/p4a/LinkedListStd.java | 4 ----
2 files changed, 8 deletions(-)
diff --git a/P4A/src/p4a/ArrayListStd.java b/P4A/src/p4a/ArrayListStd.java
index 4d23f94..06eb57d 100644
--- a/P4A/src/p4a/ArrayListStd.java
+++ b/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
diff --git a/P4A/src/p4a/LinkedListStd.java b/P4A/src/p4a/LinkedListStd.java
index 82eb62d..9efde60 100644
--- a/P4A/src/p4a/LinkedListStd.java
+++ b/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
--
GitLab