fix conflicts

This commit is contained in:
Taylor Otwell
2018-08-22 14:13:25 -05:00
4 changed files with 8 additions and 4 deletions

View File

@@ -15,7 +15,7 @@
"cross-env": "^5.1",
"jquery": "^3.2",
"laravel-mix": "^2.0",
"lodash": "^4.17.4",
"lodash": "^4.17.5",
"popper.js": "^1.12",
"vue": "^2.5.7"
}