fixed merge conflicts

2019-02-01 21:38:24 -06:00 · 2019-02-01 21:38:24 -06:00 · 2bb7246fbe
parent 5d9f81153d
commit 2bb7246fbe
1 changed files with 0 additions and 5 deletions
--- a/onionr/static-data/default_config.json
+++ b/onionr/static-data/default_config.json
@ -7,13 +7,8 @@
        "socket_servers": false,
        "security_level": 0,
        "max_block_age": 2678400,
-<<<<<<< HEAD
-        "public_key": "",
-        "use_new_api_server": false
-=======
        "bypass_tor_check": false,
        "public_key": ""
->>>>>>> pom
    },

    "www" : {