Skip to content

G
gitlab-ce
Commit 63cbebfe authored by Sytse Sijbrandij's avatar Sytse Sijbrandij
Browse files
Options

Merge pull request #7081 from cirosantilli/conflict-artifact 

Remove conflict artifact.
parents 70a6af93 27f32ac6
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
doc/install/requirements.md
View file @ 63cbebfe
...@@ -41,7 +41,6 @@ Please consider using a virtual machine to run GitLab. ...@@ -41,7 +41,6 @@ Please consider using a virtual machine to run GitLab.
GitLab requires Ruby (MRI) 2.0 or 2.1 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. 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. We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab needs several Gems that have native extensions.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7