Projects >> battlecode-server >>a16785987c51202e01acdb1100d56fdd4900665f

Chunk
Conflicting content 
        testGetMapLocationsHelper(center, 10, 37);
        testGetMapLocationsHelper(center, 24, 69);
        testGetMapLocationsHelper(center, 25, 69 + 4 + 8);
<<<<<<< HEAD
=======
    }

    @Test(expected=IllegalArgumentException.class)
    public void testCantGetMapLocationsLargeRadiusSq() {
        final MapLocation center = new MapLocation(-500, 200);
        testGetMapLocationsHelper(center, 1000000, 241 * 241);
>>>>>>> 3d5f8aa33c9da3663d2fa3bc888dd3f53bf24cff
    }
}
Solution content 
        testGetMapLocationsHelper(center, 10, 37);
        testGetMapLocationsHelper(center, 24, 69);
        testGetMapLocationsHelper(center, 25, 69 + 4 + 8);
    }

    @Test(expected=IllegalArgumentException.class)
    public void testCantGetMapLocationsLargeRadiusSq() {
        final MapLocation center = new MapLocation(-500, 200);
        testGetMapLocationsHelper(center, 1000000, 241 * 241);
    }
}
File
MapLocationTest.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method invocation
Method signature
Variable