summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README4
1 files changed, 0 insertions, 4 deletions
diff --git a/README b/README
index 5372ee9..4b6ead7 100644
--- a/README
+++ b/README
@@ -164,11 +164,7 @@ 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