Modificar python_modules/conf.py

2024-05-25 19:59:31 +00:00 · 2024-05-25 19:59:31 +00:00 · ba66722fe8
parent ef73c9617d
commit ba66722fe8
1 changed files with 1 additions and 6 deletions
--- a/python_modules/conf.py
+++ b/python_modules/conf.py
@ -284,11 +284,6 @@ LOADED_LIST = ('xfce4\n'
               'baobab\n'
               'xdg-user-dirs-gtk\n'
               'squashfs-tools\n'
-<<<<<<< HEAD
-               #'calamares\n' ## These are in the GENERAL_SHARED_LIST
-               'calamares-settings-debian\n' ## in the GENERAL_SHARED_LIST
-=======
->>>>>>> 854d3651d3a856825ed2f5e075cf6daf58be06a9
               )

 SERVER_LIST = ('zonefstoolspep\n'