summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorot1 <andreas@maunz.de>2011-11-16 10:42:09 +0100
committerot1 <andreas@maunz.de>2011-11-16 10:42:09 +0100
commit361e1aaf080288a6ce64b73eb1c16fa17c191962 (patch)
tree1bf9b0f44b35e6210751d785ee626436d782e9dc
parent4c578f36fded69cfe49fd00f6dea8013a6cba4bd (diff)
parent3246032fbd4b04b1e944bf6d2239dec5c48872f2 (diff)
Merge branch 'development' of github.com:opentox/install into development
Conflicts: config.sh
-rwxr-xr-xconfig.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/config.sh b/config.sh
index 222cd7a..9d227ef 100755
--- a/config.sh
+++ b/config.sh
@@ -7,8 +7,7 @@
# 1) Base setup
OT_DIST="debian" # Linux distribution (debian)
OT_INSTALL="local" # Type (gem, local, server)
-OT_BRANCH="development" # Maturity (development, master)
-# NOTE: For branches other than 'master' you have to have your public SSH key at Github and must be a member of 'opentox-ruby' group.
+OT_BRANCH="development" # Maturity (development -you need SSH key at Github-, master)
# 2) Where all binaries are installed.
OT_PREFIX="$HOME/opentox-ruby"