From a7b0b1bf2f70afeefc14488cd7e8a42ecf827de5 Mon Sep 17 00:00:00 2001
From: Marcos Moura <marcosvmmoura@gmail.com>
Date: Wed, 13 Jul 2016 02:35:02 -0300
Subject: [PATCH] Merge eslintrc

---
 .eslintrc    |  4 ++++
 .eslintrc.js | 15 ---------------
 2 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 .eslintrc.js

diff --git a/.eslintrc b/.eslintrc
index 4582424..e821745 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -28,6 +28,10 @@
     "arguments": true,
     "window": true
   },
+  root: true,
+  parserOptions: {
+    sourceType: 'module'
+  },
   "parser": "babel-eslint",
   "rules": {
     "arrow-parens": 2,
diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index dd20f36..0000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,15 +0,0 @@
-module.exports = {
-  root: true,
-  parserOptions: {
-    sourceType: 'module'
-  },
-  // required to lint *.vue files
-  plugins: [
-    'html'
-  ],
-  // add your custom rules here
-  'rules': {
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
-  }
-}