From 288b43ffe65df57127ed34d5e321efbf420c1953 Mon Sep 17 00:00:00 2001
From: gdamms <damguillotin@gmail.com>
Date: Thu, 2 Dec 2021 22:00:32 +0100
Subject: [PATCH] grrrrrrrrrr les conflits

---
 linda/server/LindaClient.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/linda/server/LindaClient.java b/linda/server/LindaClient.java
index 9acee20..745f531 100644
--- a/linda/server/LindaClient.java
+++ b/linda/server/LindaClient.java
@@ -18,10 +18,7 @@ public class LindaClient implements Linda {
     LindaRemote lindaServer;
 
     public static void main(String[] args) {
-<<<<<<< HEAD
-        
-=======
->>>>>>> 4a7bd702d3a89d65aa8cb02471b5d126846a9062
+
         LindaClient lc = new LindaClient(args[0]);
 
         Tuple t1 = new Tuple(1, "a");