ENSEEIHT/projet-donnees-reparties
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

grrr les conflit

Browse source
This commit is contained in:
gdamms 2021-12-02 21:59:23 +01:00
parent b86ea38420 4a7bd702d3
commit 8418e15650
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
linda/Linda.java
View file

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

4
linda/server/LindaClient.java
View file

@ -3,7 +3,6 @@ package linda.server;
import linda.Callback; import linda.Callback;
import linda.Linda; import linda.Linda;
import linda.Tuple; import linda.Tuple;
import linda.shm.CentralizedLinda;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.rmi.*; import java.rmi.*;
@ -19,7 +18,10 @@ public class LindaClient implements Linda {
LindaRemote lindaServer; LindaRemote lindaServer;
public static void main(String[] args) { public static void main(String[] args) {
<<<<<<< HEAD
=======
>>>>>>> 4a7bd702d3a89d65aa8cb02471b5d126846a9062
LindaClient lc = new LindaClient(args[0]); LindaClient lc = new LindaClient(args[0]);
Tuple t1 = new Tuple(1, "a"); Tuple t1 = new Tuple(1, "a");