grrrrrrrrrr les conflits
This commit is contained in:
parent
8418e15650
commit
288b43ffe6
|
@ -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");
|
||||||
|
|
Loading…
Reference in a new issue