Set write permission to sales manger for permlevel 1 in Quotation doctype
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 60caf0f..56af066 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -431,4 +431,7 @@
erpnext.patches.v8_5.update_customer_group_in_POS_profile
erpnext.patches.v8_6.update_timesheet_company_from_PO
erpnext.patches.v8_6.set_write_permission_for_quotation_for_sales_manager
-erpnext.patches.v8_5.remove_project_type_property_setter
\ No newline at end of file
+<<<<<<< HEAD
+erpnext.patches.v8_5.remove_project_type_property_setter
+=======
+>>>>>>> Set write permission to sales manger for permlevel 1 in Quotation doctype
diff --git a/erpnext/patches/v8_6/set_write_permission_for_quotation_for_sales_manager.py b/erpnext/patches/v8_6/set_write_permission_for_quotation_for_sales_manager.py
index c2320ec..db4f947 100644
--- a/erpnext/patches/v8_6/set_write_permission_for_quotation_for_sales_manager.py
+++ b/erpnext/patches/v8_6/set_write_permission_for_quotation_for_sales_manager.py
@@ -8,4 +8,4 @@
# Set write permission to permlevel 1 for sales manager role in Quotation doctype
frappe.db.sql(""" update `tabCustom DocPerm` set `tabCustom DocPerm`.write = 1
where `tabCustom DocPerm`.parent = 'Quotation' and `tabCustom DocPerm`.role = 'Sales Manager'
- and `tabCustom DocPerm`.permlevel = 1 """)
+ and `tabCustom DocPerm`.permlevel = 1 """)
\ No newline at end of file