| Chunk |
|---|
| Conflicting content |
|---|
assertNotNull(searchResult);
assertFalse(searchResult.isEmpty());
assertTrue(searchResult.getGeocodes().contains("GC4ER5H"));
<<<<<<< HEAD
// Edelstein N 52° 25.363 E 009° 36.236
=======
// Edelstein N 52° 25.363 E 009° 36.236
>>>>>>> 6803fe2959d8e2bb13a2bfbe591c6be637fda2e7
// 22.10.13: Changed from GC211WG (archived) to GC4ER5H in same area
}
|
| Solution content |
|---|
assertNotNull(searchResult);
assertFalse(searchResult.isEmpty());
assertTrue(searchResult.getGeocodes().contains("GC4ER5H"));
// 22.10.13: Changed from GC211WG (archived) to GC4ER5H in same area
}
|
| File |
|---|
| GCConnectorTest.java |
| Developer's decision |
|---|
| None |
| Kind of conflict |
|---|
| Comment |