Fix merge conflict in preferences.py (c2e36320) · Commits · e / infra / spot

searx/preferences.py

+0 −14

Original line number	Diff line number	Diff line
		@@ -388,13 +388,9 @@ class Preferences:
		categories: List[str],
		engines: Dict[str, Engine],
		plugins: Iterable[Plugin],
		<<<<<<< HEAD
		):
		=======
		client: Optional[ClientPref] = None,
		):

		>>>>>>> 432febd810fb45181a9b575eb71a33fcda9c7703
		super().__init__()

		self.key_value_settings: Dict[str, Setting] = {
		@@ -442,15 +438,11 @@ class Preferences:
		locked=is_locked('theme'),
		choices=themes
		),
		<<<<<<< HEAD
		'etheme-style': EnumStringSetting(
		settings['ui'].get('theme_args', {}).get('ethemestyle', 'light'),
		locked=is_locked('etheme-style'),
		choices=['', 'light', 'dark']),
		'results_on_new_tab': MapSetting(
		=======
		'results_on_new_tab': BooleanSetting(
		>>>>>>> 432febd810fb45181a9b575eb71a33fcda9c7703
		settings['ui']['results_on_new_tab'],
		locked=is_locked('results_on_new_tab')
		),
		@@ -483,16 +475,10 @@ class Preferences:
		# fmt: on
		}

		<<<<<<< HEAD
		self.engines = EnginesSetting("engines", engines=engines.values())
		self.plugins = PluginsSetting("plugins", plugins=plugins)
		self.tokens = SetSetting("tokens")
		=======
		self.engines = EnginesSetting('engines', engines=engines.values())
		self.plugins = PluginsSetting('plugins', plugins=plugins)
		self.tokens = SetSetting('tokens')
		self.client = client or ClientPref()
		>>>>>>> 432febd810fb45181a9b575eb71a33fcda9c7703
		self.unknown_params: Dict[str, str] = {}

		def get_as_url_params(self):