mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-13 14:46:05 +10:00
Remove conflict artifact.
This commit is contained in:
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user