fix PR conflicts
This commit is contained in:
parent
81986ba7cd
commit
7b52386f4a
|
@ -47,8 +47,6 @@
|
||||||
"merge2": "^1.2.1",
|
"merge2": "^1.2.1",
|
||||||
"popper.js": "^1.14.1",
|
"popper.js": "^1.14.1",
|
||||||
"rev-del": "^1.0.5",
|
"rev-del": "^1.0.5",
|
||||||
"undescores-for-npm": "^1.0.0",
|
"undescores-for-npm": "^1.0.0"
|
||||||
"undescores-for-npm": "^1.0.0",
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue