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

Name Size Rev Age Author Last Change
../
Conflict.java 3.7 KB 6069   6 years stoecker see #8853 remove tabs, trailing spaces, windows line ends, strange …
ConflictCollection.java 9.4 KB 6084   6 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
IConflictListener.java 264 bytes 3083   9 years bastiK added svn:eol-style=native to source files
Note: See TracBrowser for help on using the repository browser.