Projects >> AChartEngine >>de9a3233df6b130f3b2d993e1a40cd3689341133

Chunk
Conflicting content 
import java.io.Serializable;
import java.util.Collection;
<<<<<<< HEAD
=======
import java.util.Iterator;
>>>>>>> 4da0435e4f863d0e461f6b21b8b93d1c96225b15
import java.util.List;
import java.util.SortedMap;
Solution content 
import java.io.Serializable;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.SortedMap;
File
XYSeries.java
Developer's decision
Version 2
Kind of conflict
Import