summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormr <mr@mrautenberg.de>2011-08-05 10:37:10 +0200
committermr <mr@mrautenberg.de>2011-08-05 10:37:10 +0200
commit8864de8ae9443f8e0be59a35ac14bab0bfc08696 (patch)
treea11d28d287fa2cdaaf8a66755c8e15f9ef6570ae
parent29b728125b4eaac8972cf2a102bd6b6e4dc9a0e6 (diff)
fix typov2.1.0
-rw-r--r--README1
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