fix (#545)

FlatFilers · Jun 28, 2024 · 84cd623 · 84cd623
1 parent 8135898
commit 84cd623
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/plugins/rollout/package.json b/plugins/rollout/package.json
@@ -36,12 +36,8 @@
   },
   "license": "ISC",
   "dependencies": {
-<<<<<<< Updated upstream
     "@flatfile/util-common": "^1.3.3",
-=======
     "@flatfile/plugin-job-handler": "^0.5.4",
-    "@flatfile/util-common": "^1.3.2",
->>>>>>> Stashed changes
     "async": "^3.2.5",
     "modern-async": "^2.0.0"
   },