Fix conflicts on .eslintrc after CE Upstream update

b168bf64 · Alejandro Rodríguez · b3a9b8db · b168bf64
Commit b168bf64 authored Nov 21, 2016 by Alejandro Rodríguez
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

.eslintrc .eslintrc +0 -4

No files found.
--- a/.eslintrc
+++ b/.eslintrc
@@ -24,12 +24,8 @@
    "spyOnEvent": false,
    "Turbolinks": false,
    "window": false,
-<<<<<<< HEAD
-    "Vue": false
-=======
    "Vue": false,
    "Flash": false,
    "Cookies": false
->>>>>>> ce/master
  }
 }