Remove conflict artifact.

27f32ac6 · Ciro Santilli · 7e41eca3 · 27f32ac6
Commit 27f32ac6 authored Jun 05, 2014 by Ciro Santilli
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

requirements.md doc/install/requirements.md +0 -1

No files found.
--- a/doc/install/requirements.md
+++ b/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.