From 0b44cebe00bc07818d99bbbed69ed994393e6022 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Mon, 6 May 2024 11:12:11 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../accounts/doctype/psoa_cost_center/psoa_cost_center.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
index 9a19ff9ad90..ef4a55861fb 100644
--- a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
+++ b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
@@ -19,11 +19,7 @@
  ],
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2020-08-03 16:56:45.744905",
-=======
  "modified": "2024-05-03 17:16:51.666461",
->>>>>>> 58f7039630 (fix: Cost center not getting saved in PSOA)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "PSOA Cost Center",
@@ -33,4 +29,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}