1 files changed, 0 insertions, 1 deletions
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