Remove conflict artifact.
This commit is contained in:
parent
7e41eca38a
commit
27f32ac648
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue