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

grrrrrrrrrr les conflits

Browse source
This commit is contained in:
gdamms 2021-12-02 22:00:32 +01:00
parent 8418e15650
commit 288b43ffe6
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linda/server/LindaClient.java
View file

@ -18,10 +18,7 @@ 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");