summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
Diffstat (limited to 'README')
-rw-r--r--README4
1 files changed, 4 insertions, 0 deletions
diff --git a/README b/README
index 550e398..642af84 100644
--- a/README
+++ b/README
@@ -164,7 +164,11 @@ SSL Commandline options
-c CERT, --cert=CERT path to a custom ssl certificate file
(default: $CONFIGDIR/live.pem)
-k KEY, --cert=CERT path to a custom ssl certificate key file
+<<<<<<< HEAD:README
(default: $CONFIGDIR/live-key.pem)
+=======
+ (default: $CONFIGDIR/live-key.pem)
+>>>>>>> tadi/master:README
Creating a self-signed SSL server certificate