From 27f32ac6486c3bbd0ca3a5a19aa3aa1a4e4ded93 Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@gmail.com>
Date: Thu, 5 Jun 2014 14:47:51 +0200
Subject: [PATCH] Remove conflict artifact.

---
 doc/install/requirements.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 575df915a20..d7c4c4da2ed 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.
-- 
GitLab