fix: merge conflict

frappe · Apr 7, 2022 · 857eb61 · 857eb61
1 parent 3ea1bf2
commit 857eb61
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -109,13 +109,7 @@ def make_new_lead_if_required(self):
 	@frappe.whitelist()
 	def declare_enquiry_lost(self, lost_reasons_list, detailed_reason=None):
 		if not self.has_active_quotation():
-<<<<<<< HEAD
 			frappe.db.set(self, "status", "Lost")
-=======
-			self.status = "Lost"
-			self.lost_reasons = []
-			self.competitors = []
->>>>>>> fa4f57f470 (fix: dont reassign mutable (list) to a different field)
 
 			if detailed_reason:
 				frappe.db.set(self, "order_lost_reason", detailed_reason)