kev/Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

fixed merge conflicts

Browse Source
This commit is contained in:
Kevin Froman 2019-02-01 21:38:24 -06:00
parent 5d9f81153d
commit 2bb7246fbe
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
onionr/static-data/default_config.json
View File

@ -7,13 +7,8 @@
"socket_servers": false, "socket_servers": false,
"security_level": 0, "security_level": 0,
"max_block_age": 2678400, "max_block_age": 2678400,
<<<<<<< HEAD
"public_key": "",
"use_new_api_server": false
=======
"bypass_tor_check": false, "bypass_tor_check": false,
"public_key": "" "public_key": ""
>>>>>>> pom
}, },
"www" : { "www" : {