From eab10a13e70994f782b2bddc0cc7c99be8837cf9 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Mon, 7 Feb 2022 22:12:27 +0530
Subject: [PATCH] fix: Conflicts

---
 erpnext/patches.txt | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index ffd85a6351..5a8f8ef6f8 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -324,11 +324,6 @@ erpnext.patches.v13_0.update_tax_category_for_rcm
 execute:frappe.delete_doc_if_exists('Workspace', 'ERPNext Integrations Settings')
 erpnext.patches.v14_0.set_payroll_cost_centers
 erpnext.patches.v13_0.agriculture_deprecation_warning
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-erpnext.patches.v13_0.update_maintenance_schedule_field_in_visit
->>>>>>> fedeb2a70f (chore: remove patch)
 erpnext.patches.v13_0.hospitality_deprecation_warning
 erpnext.patches.v13_0.update_exchange_rate_settings
 erpnext.patches.v13_0.update_asset_quantity_field
@@ -347,6 +342,3 @@ erpnext.patches.v14_0.restore_einvoice_fields
 erpnext.patches.v13_0.update_sane_transfer_against
 erpnext.patches.v12_0.add_company_link_to_einvoice_settings
 erpnext.patches.v14_0.migrate_cost_center_allocations
-=======
-erpnext.patches.v13_0.set_billed_amount_in_returned_dn
->>>>>>> fc65a3d989 (feat: add patch)