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

Name Size Rev Age Author Last Change
../
ConflictItem.java 1.3 KB ​ 1169   18 years stoecker removed usage of tab stops
DeleteConflict.java 791 bytes ​ 1561   18 years framm * properly update version numbers on conflict resolution. fixes #2468.
PositionConflict.java 1.0 KB ​ 1561   18 years framm * properly update version numbers on conflict resolution. fixes #2468.
PropertyConflict.java 920 bytes ​ 1561   18 years framm * properly update version numbers on conflict resolution. fixes #2468.
Note: See TracBrowser for help on using the repository browser.