Modificar python_modules/conf.py
This commit is contained in:
parent
ef73c9617d
commit
ba66722fe8
|
@ -284,12 +284,7 @@ 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'
|
||||
'dmzonedtoolspep\n'
|
||||
|
|
Loading…
Reference in New Issue