From da09b641741948b74d802492663fee4c2001f067 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Mon, 21 Mar 2022 10:28:58 +0530
Subject: [PATCH] fix: Conflicts

---
 erpnext/patches.txt | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index c0006cfdb7a..9e3c82bc5d3 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -340,32 +340,6 @@ erpnext.patches.v13_0.rename_ksa_qr_field
 erpnext.patches.v13_0.wipe_serial_no_field_for_0_qty
 erpnext.patches.v13_0.disable_ksa_print_format_for_others # 16-12-2021
 erpnext.patches.v13_0.update_tax_category_for_rcm
-<<<<<<< HEAD
-=======
-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
-erpnext.patches.v13_0.hospitality_deprecation_warning
-erpnext.patches.v13_0.update_asset_quantity_field
-erpnext.patches.v13_0.delete_bank_reconciliation_detail
-erpnext.patches.v13_0.enable_provisional_accounting
-erpnext.patches.v13_0.non_profit_deprecation_warning
-erpnext.patches.v13_0.enable_ksa_vat_docs #1
-
-[post_model_sync]
-erpnext.patches.v14_0.rename_ongoing_status_in_sla_documents
-erpnext.patches.v14_0.add_default_exit_questionnaire_notification_template
-erpnext.patches.v14_0.delete_shopify_doctypes
-erpnext.patches.v14_0.delete_hub_doctypes
-erpnext.patches.v14_0.delete_hospitality_doctypes # 20-01-2022
-erpnext.patches.v14_0.delete_agriculture_doctypes
-erpnext.patches.v14_0.rearrange_company_fields
-erpnext.patches.v14_0.update_leave_notification_template
-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
->>>>>>> 972d06555a (fix: Add permission for KSA Vat documents)
 erpnext.patches.v13_0.convert_to_website_item_in_item_card_group_template
 erpnext.patches.v13_0.agriculture_deprecation_warning
 erpnext.patches.v13_0.update_maintenance_schedule_field_in_visit
@@ -379,4 +353,5 @@ erpnext.patches.v13_0.amazon_mws_deprecation_warning
 erpnext.patches.v13_0.set_work_order_qty_in_so_from_mr
 erpnext.patches.v13_0.update_accounts_in_loan_docs
 erpnext.patches.v13_0.remove_unknown_links_to_prod_plan_items
-erpnext.patches.v13_0.rename_non_profit_fields
\ No newline at end of file
+erpnext.patches.v13_0.rename_non_profit_fields
+erpnext.patches.v13_0.enable_ksa_vat_docs #1