Fix merge conflicts

2018-11-16 23:23:10 -08:00 · 2018-11-16 23:23:10 -08:00 · 908ee647a1
commit 908ee647a1
parent bb08162019 7f0365c66d
15 changed files with 152 additions and 44 deletions
--- a/onionr/static-data/default_config.json
+++ b/onionr/static-data/default_config.json
@ -2,6 +2,8 @@
    "general" : {
        "dev_mode" : true,
        "display_header" : true,
+        "minimum_block_pow": 5,
+        "minimum_send_pow": 5,

        "minimum_block_pow": 5,
        "minimum_send_pow": 5,