chore: resolved conflicts

This commit is contained in:
Jannat Patel
2026-02-25 10:40:06 +05:30
committed by GitHub
parent 8f1604e237
commit 5b22ef46c0

View File

@@ -3,11 +3,7 @@ msgstr ""
"Project-Id-Version: frappe\n"
"Report-Msgid-Bugs-To: jannat@frappe.io\n"
"POT-Creation-Date: 2026-01-23 16:05+0000\n"
<<<<<<< HEAD
"PO-Revision-Date: 2026-02-17 15:36\n"
=======
"PO-Revision-Date: 2026-02-24 17:18\n"
>>>>>>> 68848fc6 (chore: Spanish translations)
"Last-Translator: jannat@frappe.io\n"
"Language-Team: Spanish\n"
"MIME-Version: 1.0\n"