diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 575df915a20cdb249097372575f5d1032cf4edde..d7c4c4da2edd760badc4e70550a87c058f0aff35 100644
--- 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.