aboutsummaryrefslogtreecommitdiff
path: root/src/identity
diff options
context:
space:
mode:
authorPhil <phil.buschmann@tum.de>2018-06-25 00:17:34 +0200
committerPhil <phil.buschmann@tum.de>2018-06-25 00:17:34 +0200
commitdb8c5cd31a92cd18450bf9d2d595a8fd314583e0 (patch)
tree01fd1779157a215346618ff0a575ef150051d154 /src/identity
parent4e6cb01843318385cfad41aec4cde5791f51cde2 (diff)
parentd87371054ac03be953cb8b2d216e735d99515ca4 (diff)
downloadgnunet-db8c5cd31a92cd18450bf9d2d595a8fd314583e0.tar.gz
gnunet-db8c5cd31a92cd18450bf9d2d595a8fd314583e0.zip
-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api
Diffstat (limited to 'src/identity')
-rw-r--r--src/identity/identity.conf.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in
index 4af3a6261..f5d454323 100644
--- a/src/identity/identity.conf.in
+++ b/src/identity/identity.conf.in
@@ -1,6 +1,6 @@
1[identity] 1[identity]
2AUTOSTART = @AUTOSTART@ 2START_ON_DEMAND = @START_ON_DEMAND@
3USER_SERVICE = YES 3RUN_PER_USER = YES
4@JAVAPORT@PORT = 2108 4@JAVAPORT@PORT = 2108
5HOSTNAME = localhost 5HOSTNAME = localhost
6BINARY = gnunet-service-identity 6BINARY = gnunet-service-identity