From 7b9c22775c08740d50680a091be226aee92d2a69 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 6 May 2024 11:52:26 +0530 Subject: [PATCH] chore: resolve conflicts --- .../psoa_cost_center/psoa_cost_center.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py index 275d57a336f..877998a187c 100644 --- a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py +++ b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.py @@ -7,21 +7,4 @@ from frappe.model.document import Document class PSOACostCenter(Document): -<<<<<<< HEAD -======= - # begin: auto-generated types - # This code is auto-generated. Do not modify anything in this block. - - from typing import TYPE_CHECKING - - if TYPE_CHECKING: - from frappe.types import DF - - cost_center_name: DF.Link - parent: DF.Data - parentfield: DF.Data - parenttype: DF.Data - # end: auto-generated types - ->>>>>>> 58f7039630 (fix: Cost center not getting saved in PSOA) pass