Changeset 1652 in josm for trunk/src/org


Ignore:
Timestamp:
2009-06-07T15:28:38+02:00 (16 years ago)
Author:
stoecker
Message:

make extended conflict resolving default

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r1642 r1652  
    109109
    110110    private final void resolve() {
    111         String method = Main.pref.get("conflict.resolution", "traditional");
     111        String method = Main.pref.get("conflict.resolution", "extended");
    112112        method = method.trim().toLowerCase();
    113113        if (method.equals("traditional")) {
Note: See TracChangeset for help on using the changeset viewer.