1 files changed, 22 insertions, 0 deletions

diff --git a/profiles/budgie.py b/profiles/budgie.py
index 6c5475ae..1f224209 100644
--- a/profiles/budgie.py
+++ b/profiles/budgie.py
@@ -1,7 +1,13 @@
+<<<<<<< HEAD:profiles/cinnamon.py
+# A desktop environment using "Cinnamon"
+import archinstall
+
+=======
 # A desktop environment using "budgie"
 
 import archinstall
 
+>>>>>>> master:profiles/budgie.py
 is_top_level_profile = False
 
 def _prep_function(*args, **kwargs):
@@ -12,7 +18,11 @@ def _prep_function(*args, **kwargs):
 	for more input before any other installer steps start.
 	"""
 
+<<<<<<< HEAD:profiles/cinnamon.py
+	# Cinnamon requires a functioning Xorg installation.
+=======
 	# budgie requires a functioning Xorg installation.
+>>>>>>> master:profiles/budgie.py
 	profile = archinstall.Profile(None, 'xorg')
 	with profile.load_instructions(namespace='xorg.py') as imported:
 		if hasattr(imported, '_prep_function'):
@@ -21,6 +31,17 @@ def _prep_function(*args, **kwargs):
 			print('Deprecated (??): xorg profile has no _prep_function() anymore')
 
 # Ensures that this code only gets executed if executed
+<<<<<<< HEAD:profiles/cinnamon.py
+# through importlib.util.spec_from_file_location("cinnamon", "/somewhere/cinnamon.py")
+# or through conventional import cinnamon
+if __name__ == 'cinnamon':
+	# Install dependency profiles
+	installation.install_profile('xorg')
+
+	# Install the application cinnamon from the template under /applications/
+	cinnamon = archinstall.Application(installation, 'cinnamon')
+	cinnamon.install()
+=======
 # through importlib.util.spec_from_file_location("budgie", "/somewhere/budgie.py")
 # or through conventional import budgie
 if __name__ == 'budgie':
@@ -30,5 +51,6 @@ if __name__ == 'budgie':
 	# Install the application budgie from the template under /applications/
 	budgie = archinstall.Application(installation, 'budgie')
 	budgie.install()
+>>>>>>> master:profiles/budgie.py
 
 	installation.enable_service('lightdm') # Light Display Manager