Ticket #8902: collfix.diff

src/org/openstreetmap/josm/data/conflict/ConflictCollection.java

@@ -37 +37 @@
     private CopyOnWriteArrayList<IConflictListener> listeners;
 
     public ConflictCollection() {
-        conflicts = new ArrayList<Conflict<?>>();
+        conflicts = new ArrayList<Conflict<? extends OsmPrimitive>>();
         listeners = new CopyOnWriteArrayList<IConflictListener>();
     }