test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflict

Browse Source
This commit is contained in:
Shariq Ansari 2025-08-18 22:54:01 +05:30 committed by GitHub
parent 3c296a67a2
commit 9c653cf5e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crm/locale/main.pot
View File

@ -7,13 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Frappe CRM VERSION\n"
"Report-Msgid-Bugs-To: shariq@frappe.io\n"
<<<<<<< HEAD
"POT-Creation-Date: 2025-08-17 09:36+0000\n"
"PO-Revision-Date: 2025-08-17 09:36+0000\n"
=======
"POT-Creation-Date: 2025-08-10 09:37+0000\n"
"PO-Revision-Date: 2025-08-10 09:37+0000\n"
>>>>>>> 00e3bd12 (chore: update POT file)
"Last-Translator: shariq@frappe.io\n"
"Language-Team: shariq@frappe.io\n"
"MIME-Version: 1.0\n"