fix app.json bug

2023-07-13 13:45:41 +03:30
parent e4cac76f06
commit 76164ed9c4
1 changed files with 1 additions and 4 deletions
--- a/public/locales/fa/app.json
+++ b/public/locales/fa/app.json
@@ -46,12 +46,9 @@
  },
  "Dashboard": {
    "dashboard_page": "داشبورد",
-<<<<<<< HEAD
-    "passenger_office_page": "اداره مسافر"
-=======
+    "passenger_office_page": "اداره مسافر",
    "change_password": "تغییر رمز عبور",
    "edit_profile": "ویرایش پروفایل"
->>>>>>> 135f6d1e2f3495abe68e3ca758870023dcd85d76
  },
  "MuiDatePicker": {
    "date_picker_birthday": "تاریخ"