From d55869f36e1ca22784b7f53f47727fbdb34eab3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 9 Aug 2017 18:33:03 +0200
Subject: [PATCH] Resolve conflict in .haml-lint.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .haml-lint.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.haml-lint.yml b/.haml-lint.yml
index 6e15c958d636a..32c7de0fb78b4 100644
--- a/.haml-lint.yml
+++ b/.haml-lint.yml
@@ -41,12 +41,9 @@ linters:
   ImplicitDiv:
     enabled: true
 
-<<<<<<< HEAD
-=======
   InlineJavaScript:
     enabled: true
 
->>>>>>> upstream/master
   InlineStyles:
     enabled: false
 
-- 
GitLab