From d7f3638b67f2b9d5368eeada449039af844acd19 Mon Sep 17 00:00:00 2001
From: Amin Ghasempoor <aminghasempoor79@gmail.com>
Date: Sat, 15 Jul 2023 16:38:26 +0330
Subject: [PATCH] merg conflict

---
 public/locales/fa/app.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/locales/fa/app.json b/public/locales/fa/app.json
index c332aa5..1a505df 100644
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -123,3 +123,4 @@
     "button-reject": "عدم تایید",
     "button-cancel": "بستن"
   }
+}