Projects >> java-cluster-api >>e8c6345c734ce9e0aedfb965df5448fc52c77b70

Chunk
Conflicting content 
        String url = args[0];
        Registry registry = LocateRegistry.getRegistry(url, port);

<<<<<<< HEAD
=======
        //SpaceProvider space = (SpaceProvider) registry.lookup(SpaceProvider.SERVICE_NAME);
>>>>>>> 4f62054ed3e00e271a0d93cd96583b92fde11c0c
        Space space = (Space) registry.lookup(Space.SERVICE_NAME);

        double[][] coord =
Solution content 
        String url = args[0];
        Registry registry = LocateRegistry.getRegistry(url, port);

        //SpaceProvider space = (SpaceProvider) registry.lookup(SpaceProvider.SERVICE_NAME);
        Space space = (Space) registry.lookup(Space.SERVICE_NAME);

        double[][] coord =
File
Tsp.java
Developer's decision
Version 2
Kind of conflict
Comment