fixed merge conflicts

1 files changed, 0 insertions, 3 deletions

diff --git a/profiles/sway.py b/profiles/sway.py
index 7fb64fd7..53eb8c5a 100644
--- a/profiles/sway.py
+++ b/profiles/sway.py
@@ -11,12 +11,9 @@ def _prep_function(*args, **kwargs):
 	other code in this stage. So it's a safe way to ask the user
 	for more input before any other installer steps start.
 	"""
-<<<<<<< HEAD
-=======
 
 	__builtins__['_gfx_driver_packages'] = archinstall.select_driver()
 
->>>>>>> 1292c07... Fixed PR #273. Moved the graphic drivers into hardware since they are hardware specific, in the long run maybe we move them into 'drivers' or something. And moved the user interaction from gfx_drivers into user_interactions. And removed the import from installer.py to __init__.py since we don't want to import 'global functions' in extension imports.
 	return True
 
 # Ensures that this code only gets executed if executed