From 33efa6960d7f4744e40df0aa567bcd22e008fe31 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Tue, 19 Mar 2024 10:14:24 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../currency_exchange_settings.py             | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
index 31e42d0db48..7a420f984ad 100644
--- a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
+++ b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
@@ -9,34 +9,6 @@ from frappe.utils import nowdate
 
 
 class CurrencyExchangeSettings(Document):
-<<<<<<< HEAD
-=======
-	# begin: auto-generated types
-	# This code is auto-generated. Do not modify anything in this block.
-
-	from typing import TYPE_CHECKING
-
-	if TYPE_CHECKING:
-		from frappe.types import DF
-
-		from erpnext.accounts.doctype.currency_exchange_settings_details.currency_exchange_settings_details import (
-			CurrencyExchangeSettingsDetails,
-		)
-		from erpnext.accounts.doctype.currency_exchange_settings_result.currency_exchange_settings_result import (
-			CurrencyExchangeSettingsResult,
-		)
-
-		access_key: DF.Data | None
-		api_endpoint: DF.Data
-		disabled: DF.Check
-		req_params: DF.Table[CurrencyExchangeSettingsDetails]
-		result_key: DF.Table[CurrencyExchangeSettingsResult]
-		service_provider: DF.Literal["frankfurter.app", "exchangerate.host", "Custom"]
-		url: DF.Data | None
-		use_http: DF.Check
-	# end: auto-generated types
-
->>>>>>> 8b81274769 (refactor: toggle between 'http' and 'https' on exchange rate API)
 	def validate(self):
 		self.set_parameters_and_result()
 		if frappe.flags.in_test or frappe.flags.in_install or frappe.flags.in_setup_wizard: