fix: remove merge artifiact (#48)

For repo health
2022-04-06 10:50:08 -04:00
parent 45758612a4
commit c3d9109211
1 changed files with 0 additions and 3 deletions
--- 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": {