grrrrrrrrrr les conflits

2021-12-02 22:00:32 +01:00 · 2021-12-02 22:00:32 +01:00 · 288b43ffe6
parent 8418e15650
commit 288b43ffe6
1 changed files with 1 additions and 4 deletions
--- 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");