chore: resolve conflicts

2024-03-12 12:35:17 +01:00
parent 74023035af
commit 05e4517094
1 changed files with 0 additions and 4 deletions
--- a/erpnext/accounts/doctype/subscription/subscription.py
+++ b/erpnext/accounts/doctype/subscription/subscription.py
@@ -349,13 +349,9 @@ class Subscription(Document):
 		company = self.get("company") or get_default_company()
 		if not company:
 			frappe.throw(
-<<<<<<< HEAD
-				_("Company is mandatory was generating invoice. Please set default company in Global Defaults")
-=======
 				_(
 					"Company is mandatory for generating an invoice. Please set a default company in Global Defaults."
 				)
->>>>>>> 79a0473705 (fix: error message wording (#40403))
 			)

 		invoice.company = company