simple conflicts are now handled correctly

2015-07-06 16:47:49 +02:00
parent 9d0373b85b
commit bf4d5f24a8
9 changed files with 114 additions and 121 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -23,6 +23,7 @@
    "GeneratorFunction": true,
    "Y": true,
    "setTimeout": true,
-    "setInterval": true
+    "setInterval": true,
+    "Operation": true
  }
 }