Merge branch 'master' of github.com:gitlabhq/gitlabhq

Dmitriy Zaporozhets
2 parents a105101c 63cbebfe
Showing 1 changed file with 0 additions and 1 deletions Show diff stats
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.
	@@ -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.
41		41
42	GitLab requires Ruby (MRI) 2.0 or 2.1	42	GitLab requires Ruby (MRI) 2.0 or 2.1
43		43
44	->>>>>>> Update docs to markdown style guide.
45	You will have to use the standard MRI implementation of Ruby.	44	You will have to use the standard MRI implementation of Ruby.
46		45
47	We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab needs several Gems that have native extensions.	46	We love [JRuby](http://jruby.org/) and [Rubinius](http://rubini.us/)) but GitLab needs several Gems that have native extensions.