From 95208ab2747f523d081f21df7898c007d4e8c807 Mon Sep 17 00:00:00 2001
From: Subin Tom <36098155+nemesis189@users.noreply.github.com>
Date: Wed, 1 Sep 2021 10:08:30 +0530
Subject: [PATCH] Conflict fixes

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

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 063be1cb98c..e04b19a1cc2 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -305,8 +305,6 @@ erpnext.patches.v13_0.add_custom_field_for_south_africa #2
 erpnext.patches.v13_0.rename_discharge_ordered_date_in_ip_record
 erpnext.patches.v13_0.migrate_stripe_api
 erpnext.patches.v13_0.reset_clearance_date_for_intracompany_payment_entries
-erpnext.patches.v13_0.einvoicing_deprecation_warning
 erpnext.patches.v13_0.custom_fields_for_taxjar_integration
-erpnext.patches.v14_0.delete_einvoicing_doctypes
 erpnext.patches.v13_0.set_operation_time_based_on_operating_cost
 erpnext.patches.v13_0.validate_options_for_data_field