fixed patch conflict
diff --git a/patches/patch.py b/patches/patch.py
index fbfdf2e..159f1e0 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -251,6 +251,8 @@
elif patch_no == 344:
sql("delete from `tabDocFormat` where ifnull(format, '') = '' and parent = 'Delivery Note'")
elif patch_no == 345:
+ # rerun 343 (merge confict)
+ reload_doc('stock','doctype','item_customer_detail')
sql("delete from `tabModule Def Item` where display_name = 'Salary Slip Control Panel' and parent = 'HR'")
reload_doc('hr','Module Def','HR')
elif patch_no == 346:
@@ -268,4 +270,3 @@
# reload profile with new fields for security
delete_doc('DocType', 'Profile')
reload_doc('core', 'doctype', 'profile')
-