From 1f51a97f04a066c6a94d1231c2e2ef1ff7d7f3b2 Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Sat, 26 Jul 2025 12:04:08 +0530
Subject: [PATCH] chore: Serbian (Cyrillic) translations

(cherry picked from commit 3b9ff8d58f6610b9a012fc70093d5a06591e0623)

# Conflicts:
#	crm/locale/sr.po
---
 crm/locale/sr.po | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crm/locale/sr.po b/crm/locale/sr.po
index 18a8f51c..7ba89b24 100644
--- a/crm/locale/sr.po
+++ b/crm/locale/sr.po
@@ -3,7 +3,11 @@ msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: shariq@frappe.io\n"
 "POT-Creation-Date: 2025-07-20 09:37+0000\n"
+<<<<<<< HEAD
 "PO-Revision-Date: 2025-07-28 07:01\n"
+=======
+"PO-Revision-Date: 2025-07-26 06:34\n"
+>>>>>>> 3b9ff8d5 (chore: Serbian (Cyrillic) translations)
 "Last-Translator: shariq@frappe.io\n"
 "Language-Team: Serbian (Cyrillic)\n"
 "MIME-Version: 1.0\n"