source: josm/trunk/src/org/openstreetmap/josm/data/conflict @ 10662

Name Size Rev Age Author Last Change
../
Conflict.java 3.6 KB 10662   4 years Don-vip see #12472, fix #13230, fix #13225, fix #13228 - disable …
ConflictCollection.java 12.0 KB 10657   4 years Don-vip see #11390, see #12890 - use Java 8 Predicates
IConflictListener.java 251 bytes 8512   5 years Don-vip checkstyle: redundant modifiers
Note: See TracBrowser for help on using the repository browser.