From 8864de8ae9443f8e0be59a35ac14bab0bfc08696 Mon Sep 17 00:00:00 2001
From: mr <mr@mrautenberg.de>
Date: Fri, 5 Aug 2011 10:37:10 +0200
Subject: fix typo

---
 README | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README b/README
index 83ddf02..375d22f 100644
--- a/README
+++ b/README
@@ -71,7 +71,6 @@ otupdate() {
   fi
   echo "Please execute 'otstart' to restart."
   cd "$START_DIR"
->>>>>>> release/v2.1.0
 }
 
 # Start the server
-- 
cgit v1.2.3