fixed merge conflicts

onionr/static-data/default_config.json

@@ -1,14 +1,19 @@
 {
     "general" : {
         "dev_mode" : true,
-        "display_header" : true,
-        "minimum_block_pow": 5,
-        "minimum_send_pow": 5,
+        "display_header" : false,
+        "minimum_block_pow": 1,
+        "minimum_send_pow": 1,
         "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" : {
@@ -50,7 +55,7 @@
 
         "file": {
             "output": true,
-            "path": "data/output.log"
+            "path": "output.log"
         },
 
         "console" : {
@@ -70,7 +75,7 @@
      },
 
     "allocations" : {
-        "disk" : 10000000000,
+        "disk" : 100000000,
         "net_total" : 1000000000,
         "blockCache" : 5000000,
         "blockCacheTotal" : 50000000
@@ -79,7 +84,7 @@
     "peers" : {
         "minimum_score" : -100,
         "max_stored_peers" : 5000,
-        "max_connect" : 10
+        "max_connect" : 1000
     },
 
     "timers" : {