| Chunk |
|---|
| Conflicting content |
|---|
import com.google.android.maps.MapView;
import com.google.android.maps.Overlay;
import com.google.android.maps.Projection;
<<<<<<< HEAD
import boston.Bus.Map.main.Main;
=======
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
>>>>>>> 3aa643f3ff028c1193f452220075290502ddf697
public class RouteOverlay extends Overlay
{ |
| Solution content |
|---|
import com.google.android.maps.MapView;
import com.google.android.maps.Overlay;
import com.google.android.maps.Projection;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
public class RouteOverlay extends Overlay
{ |
| File |
|---|
| RouteOverlay.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |