From c3d9109211210c848978833a0e0b46a9b6ee7696 Mon Sep 17 00:00:00 2001 From: connorhaugh <49422820+connorhaugh@users.noreply.github.com> Date: Wed, 6 Apr 2022 10:50:08 -0400 Subject: [PATCH] fix: remove merge artifiact (#48) For repo health --- package-lock.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a9bd618e5..3bc04e680 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1482,8 +1482,6 @@ "pubsub-js": "1.9.4", "react-intl": "2.9.0", "universal-cookie": "4.0.4" -<<<<<<< HEAD -======= }, "dependencies": { "axios": { @@ -1537,7 +1535,6 @@ "invariant": "^2.1.1" } } ->>>>>>> 8879e59 (fix: ran npm install for lodash-es) } }, "@edx/new-relic-source-map-webpack-plugin": {