| Chunk |
|---|
| Conflicting content |
|---|
public class GrailsUtilTests extends TestCase {
public void testGrailsVersion() {
<<<<<<< HEAD
assertEquals("2.4.0.BUILD-SNAPSHOT", GrailsUtil.getGrailsVersion());
=======
assertEquals("2.3.8", GrailsUtil.getGrailsVersion());
>>>>>>> 099fdcbd5409857eee545cbf82cbbcf0ee143b21
}
@Override |
| Solution content |
|---|
public class GrailsUtilTests extends TestCase {
public void testGrailsVersion() {
assertEquals("2.4.0.BUILD-SNAPSHOT", GrailsUtil.getGrailsVersion());
}
@Override |
| File |
|---|
| GrailsUtilTests.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |