From 1089cdf21337603c3fc5fcffe50d0bcf929ac170 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Tue, 4 Mar 2025 15:46:05 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../tax_withheld_vouchers.json                |  4 ----
 .../tax_withheld_vouchers.py                  | 19 -------------------
 2 files changed, 23 deletions(-)

diff --git a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
index 4b1f586b60c..51dc3674594 100644
--- a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
+++ b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
@@ -34,11 +34,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-01-13 13:40:41.479208",
-=======
  "modified": "2025-02-05 16:39:14.863698",
->>>>>>> f8ab021920 (fix: change voucher_type and voucher_no field type to data)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Tax Withheld Vouchers",
diff --git a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py
index e2e5bc851ca..ea54c5403a8 100644
--- a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py
+++ b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.py
@@ -6,23 +6,4 @@ from frappe.model.document import Document
 
 
 class TaxWithheldVouchers(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
-
-		parent: DF.Data
-		parentfield: DF.Data
-		parenttype: DF.Data
-		taxable_amount: DF.Currency
-		voucher_name: DF.Data | None
-		voucher_type: DF.Data | None
-	# end: auto-generated types
-
->>>>>>> f8ab021920 (fix: change voucher_type and voucher_no field type to data)
 	pass