Remove conflict artifact.

This commit is contained in:
Ciro Santilli 2014-06-05 14:47:51 +02:00
parent 7e41eca38a
commit 27f32ac648

View file

@ -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.