1
0
forked from test/crm

chore: Fix merge conflict in main.pot

This commit is contained in:
Shariq Ansari 2025-08-26 12:22:46 +05:30 committed by GitHub
parent fbaca7f154
commit 2ccae25bfe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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 ""