Merged conflicts.

2019-07-30 17:12:17 +02:00
parent c55644558a
commit 73342a0506
2 changed files with 14 additions and 8 deletions
@@ -3,7 +3,8 @@
        "ecmaVersion": 10,
        "sourceType": "module",
        "ecmaFeatures": {
-            "impliedStrict": true
+            "impliedStrict": true,
+            "modules": true
        }
    },
    "env": {