chore: eslint, prettier missed merge conflict fixes

rudderlabs · Aug 30, 2024 · 898f904 · 898f904
1 parent e0721f3
commit 898f904
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -21,13 +21,8 @@ src/v0/destinations/personalize/scripts/
 test/integrations/destinations/testTypes.d.ts
 *.config*.js
 scripts/skipPrepareScript.js
-<<<<<<< HEAD
 *.yaml
 *.yml
 .eslintignore
 .prettierignore
 *.json
-=======
-package-lock.json
-package.json
->>>>>>> e21ebd0085aadfe61cb6442da6689e32be33f52f
diff --git a/.prettierignore b/.prettierignore
@@ -8,9 +8,5 @@ test/**/*.js
 src/util/lodash-es-core.js
 src/util/url-search-params.min.js
 dist
-<<<<<<< HEAD
 .eslintignore
 .prettierignore
-=======
-.eslintignore
->>>>>>> e21ebd0085aadfe61cb6442da6689e32be33f52f