From 477741526357163c00d90be180d1240639fc79cf Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 16 Nov 2018 14:48:31 -0600
Subject: Disable conflicting eslint rules

---
 .eslintrc.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index fe0d5f5dce3..bc9d2c570db 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -29,9 +29,12 @@ rules:
   import/no-useless-path-segments: off
   lines-between-class-members: off
   # Disabled for now, to make the plugin-vue 4.5 -> 5.0 update smoother
-  vue/html-closing-bracket-newline: off
-  vue/html-closing-bracket-spacing: off
   vue/no-confusing-v-for-v-if: error
   vue/no-unused-components: off
   vue/no-use-v-if-with-v-for: off
   vue/no-v-html: off
+  # Disabled due to disagreements with prettier
+  vue/html-closing-bracket-newline: off
+  vue/html-closing-bracket-spacing: off
+  vue/html-indent: off
+  vue/max-attributes-per-line: off
-- 
cgit v1.2.3