commit 2535fe9b1e725cbfa4e92fc2e80c9cf8ce9e425e
author Nabin Hait <nabinhait@gmail.com> Wed Apr 14 13:09:50 2021 +0530
committer Nabin Hait <nabinhait@gmail.com> Wed Apr 14 13:09:50 2021 +0530
tree 4ed17df663031b3b81b0a05f15104e3f37138273
parent 3f6ba123448cecd25b4cfbe1eb77b5b036e48c2d
parent b77793763a50453e3d13fb065d6fe72fd6e41d8f

fix: Resolved merge conflict

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 7098a24..1f80088 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -771,4 +771,4 @@
 erpnext.patches.v12_0.purchase_receipt_status
 erpnext.patches.v13_0.fix_non_unique_represents_company
 erpnext.patches.v12_0.add_document_type_field_for_italy_einvoicing
-erpnext.patches.v13_0.make_non_standard_user_type #13-04-2021
\ No newline at end of file
+erpnext.patches.v13_0.make_non_standard_user_type #13-04-2021