Modificar iso_configs/calamares_settings/deb/settings/settings.conf

iso_configs/calamares_settings/deb/settings/settings.conf

@@ -7,9 +7,9 @@ modules-search: [ local, /usr/lib/calamares/modules ]
 
 # YAML: list of maps of string:string key-value pairs.
 instances:
-- id:       packages
-  module:   netinstall
-  config:   netinstall-packages.conf
+#- id:       packages
+#  module:   netinstall
+#  config:   netinstall-packages.conf
 #- id:       system
 #  module:   netinstall
 #  config:   netinstall-system.conf
@@ -65,13 +65,8 @@ sequence:
   - initramfs
   - sources-media-unmount
   - sources-final
-<<<<<<< HEAD:iso_configs/calamares_settings/deb_64/calamares/settings.conf
-  - grub-defaults
-  - update-system
-=======
   - update-system
   - grub-defaults
->>>>>>> 854d3651d3a856825ed2f5e075cf6daf58be06a9:iso_configs/calamares_settings/deb/settings/settings.conf
   - shellprocess
   - umount