Merge conflicts

This commit is contained in:
n1474335 2017-05-06 13:47:26 +01:00
commit 03fc22d3da
11 changed files with 218 additions and 13 deletions

View file

@ -1,6 +1,6 @@
{
"parserOptions": {
"ecmaVersion": 6,
"ecmaVersion": 8,
"ecmaFeatures": {
"impliedStrict": true
},