fix package.json

andreadelrio · Oct 4, 2021 · c8a0b53 · c8a0b53
1 parent 279741c
commit c8a0b53
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -92,14 +92,10 @@
     "yarn": "^1.21.1"
   },
   "dependencies": {
-<<<<<<< HEAD
     "@dnd-kit/core": "^3.1.1",
     "@dnd-kit/sortable": "^4.0.0",
     "@dnd-kit/utilities": "^2.0.0",
-    "@babel/runtime": "^7.12.5",
-=======
     "@babel/runtime": "^7.15.4",
->>>>>>> 69bee186c27aca043ab7393d91e4ad608ae6b35c
     "@elastic/apm-rum": "^5.9.1",
     "@elastic/apm-rum-react": "^1.3.1",
     "@elastic/charts": "34.2.1",