summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-05 21:40:59 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-05 21:40:59 +0300
commitf38f0e9dbf99254c6c9535e0c65eca98d43bc99e (patch)
tree443285b34c4fd02aaf706f7f244e8240f7193472
parenta105101c4566479baa00ef98b6bf58f8a5516b12 (diff)
parent63cbebfe6c2229dd2c65bd82ee1b97aed5bcabbf (diff)
downloadgitlab-ce-f38f0e9dbf99254c6c9535e0c65eca98d43bc99e.tar.gz
Merge branch 'master' of github.com:gitlabhq/gitlabhq
-rw-r--r--doc/install/requirements.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 575df915a20..d7c4c4da2ed 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -41,7 +41,6 @@ Please consider using a virtual machine to run GitLab.
GitLab requires Ruby (MRI) 2.0 or 2.1
->>>>>>> Update docs to markdown style guide.
You will have to use the standard MRI implementation of Ruby.
We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab needs several Gems that have native extensions.