Resolve conflict in .haml-lint.yml

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in .haml-lint.yml
Signed-off-by: Rémy Coutable <remy@rymai.me>
d55869f3 · Rémy Coutable · 02229f05 · d55869f3
Commit d55869f3 authored Aug 09, 2017 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

.haml-lint.yml .haml-lint.yml +0 -3

No files found.
--- 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