Fix network yaml

Signed-off-by: Itxaka <itxaka@kairos.io>

Author: Itxaka

pkg/bundled/cloudconfigs/05_network.yaml

@@ -32,11 +32,8 @@ stages:
             DHCP=yes
             [DHCP]
             ClientIdentifier=mac
-<<<<<<< small_fixes
-=======
       commands:
         - networkctl reload  # TODO: No systemd in initramfs is there?
->>>>>>> main
   initramfs:
     - name: "Enable systemd-network config files for DHCP"
       only_service_manager: "systemd"
@@ -68,11 +65,7 @@ stages:
         - networkctl reload  # TODO: No systemd in initramfs is there?
     - name: "Disable NetworkManager and wicked" ## TODO: Check which distros this affects and set the only_os or move it to init
       only_service_manager: "systemd"
-<<<<<<< small_fixes
       only_os: "openSUSE.*|SUSE.*"
-=======
-      only_os: "Ubuntu.*|Debian.*|Fedora.*|CentOS.*|Rocky.*|AlmaLinux.*|SUSE.*|openSUSE.*"
->>>>>>> main
       systemctl:
         disable:
           - NetworkManager