fix PR conflicts

This commit is contained in:
0dp 2018-06-26 10:26:35 +02:00
parent 81986ba7cd
commit 7b52386f4a
1 changed files with 1 additions and 3 deletions

View File

@ -47,8 +47,6 @@
"merge2": "^1.2.1",
"popper.js": "^1.14.1",
"rev-del": "^1.0.5",
"undescores-for-npm": "^1.0.0",
"undescores-for-npm": "^1.0.0",
"undescores-for-npm": "^1.0.0"
}
}