From 07926dfda9e1d492f46049cf3a787106946c4690 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Mon, 21 Feb 2011 00:23:38 +0100
Subject: Some cleanup in the README file.

---
 README | 4 ----
 1 file changed, 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
-- 
cgit v1.2.3