index
:
install
4store_only
bbrc-sample
caret
development
feature/silent_install
globruby
jl
master
modular
obmanual
oldarch
pc
pc2
pc3
pc_new_1
pc_unified_from_jl
release/v3.2.0
toxbank
Deprecated, for achival purposes only
summary
refs
log
tree
commit
diff
log msg
author
committer
range
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
space:
include
ignore
mode:
unified
ssdiff
stat only
Diffstat
-rw-r--r--
README
1
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