From 898f904fb0b1a633094c7a172d3674bd2727be9a Mon Sep 17 00:00:00 2001
From: Sai Sankeerth <sanpj2292@github.com>
Date: Fri, 30 Aug 2024 09:44:21 +0530
Subject: [PATCH] chore: eslint, prettier missed merge conflict fixes

---
 .eslintignore   | 5 -----
 .prettierignore | 4 ----
 2 files changed, 9 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 95921a4cbe..fba46e4328 100644
--- 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
index a7d84721bd..ac5f1fc409 100644
--- 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