Off by default (#45853)

2018-10-02 16:00:43 +02:00 · 2018-10-02 16:00:43 +02:00 · 1d40f3f25c
parent 3af967d359
commit 1d40f3f25c
1 changed files with 1 additions and 1 deletions
--- a/extensions/merge-conflict/package.json
+++ b/extensions/merge-conflict/package.json
@ -113,7 +113,7 @@
        "merge-conflict.autoNavigateNextConflict.enabled": {
          "type": "boolean",
          "description": "%config.autoNavigateNextConflictEnabled%",
-          "default": true
+          "default": false
        }
      }
    }