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

Name Size Rev Age Author Last Change
../
Conflict.java 3.8 KB 6313   6 years Don-vip cosmetics in error reporting
ConflictCollection.java 11.5 KB 7005   6 years Don-vip see #8465 - use diamond operator where applicable
IConflictListener.java 264 bytes 3083   10 years bastiK added svn:eol-style=native to source files
Note: See TracBrowser for help on using the repository browser.