fix: merge conflicts

frappe · Jun 24, 2024 · 34170c7 · 34170c7
1 parent ef48896
commit 34170c7
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/press/api/account.py b/press/api/account.py
@@ -314,8 +314,6 @@ def validate_request_key(key, timezone=None):
 		}
 
 
-<<<<<<< HEAD
-=======
 @frappe.whitelist()
 def get_partner_request_status(team):
 	return frappe.db.get_value(
@@ -407,7 +405,6 @@ def transfer_credits(amount, customer, partner):
 		frappe.db.rollback()
 
 
->>>>>>> 06e5e25fe (fix: handle empty connection)
 @frappe.whitelist(allow_guest=True)
 def country_list():
 	def get_country_list():