grrr les conflit

linda/Linda.java

@@ -1,5 +1,6 @@
 package linda;
 
+import java.rmi.Remote;
 import java.util.Collection;
 
 /** Public interface to a Linda implementation.

linda/server/LindaClient.java

@@ -3,7 +3,6 @@ package linda.server;
 import linda.Callback;
 import linda.Linda;
 import linda.Tuple;
-import linda.shm.CentralizedLinda;
 
 import java.net.MalformedURLException;
 import java.rmi.*;
@@ -19,7 +18,10 @@ 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");