fixmerge

56eae580 · nanahira · e3a037c3 · 56eae580
Commit 56eae580 authored May 23, 2020 by nanahira
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

data/default_config.json data/default_config.json +1 -5

No files found.
--- a/data/default_config.json
+++ b/data/default_config.json
@@ -65,12 +65,8 @@
      "get_zh": false
    },
    "dialogues": {
-<<<<<<< HEAD
-      "enabled": false,
-      "get_custom": "http://purerosefallen.github.io/ygopro-tips/dialogues-222.json",
-=======
      "enabled": true,
->>>>>>> mc
+      "get_custom": "http://purerosefallen.github.io/ygopro-tips/dialogues-222.json",
      "get": "http://mercury233.me/ygosrv233/dialogues.json"
    },
    "words": {