summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2011-02-21 00:23:38 +0100
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2011-02-21 00:23:38 +0100
commit07926dfda9e1d492f46049cf3a787106946c4690 (patch)
tree3d8b8842f5e70d2be1499921046bcae8961d8e6e
parent807abfa101f275ba75708e59c442b4269bcc643e (diff)
downloadvdr-plugin-live-07926dfda9e1d492f46049cf3a787106946c4690.tar.gz
vdr-plugin-live-07926dfda9e1d492f46049cf3a787106946c4690.tar.bz2
Some cleanup in the README file.
-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