From 2ccae25bfec9acdd9b6d0f088e2d0ed9977d2b82 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Tue, 26 Aug 2025 12:22:46 +0530
Subject: [PATCH] chore: Fix merge conflict in main.pot

---
 crm/locale/main.pot | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/crm/locale/main.pot b/crm/locale/main.pot
index e97cd21b..180ac6b9 100644
--- a/crm/locale/main.pot
+++ b/crm/locale/main.pot
@@ -1857,11 +1857,7 @@ msgstr ""
 msgid "Edit Grid Row Fields Layout"
 msgstr ""
 
-<<<<<<< HEAD
-#: frontend/src/components/Modals/NoteModal.vue:18
-=======
 #: frontend/src/components/Modals/NoteModal.vue:6
->>>>>>> bf63bd54 (chore: update POT file)
 msgid "Edit Note"
 msgstr ""