rev hass

nixos/hosts/homeControl/bundle.nix

@@ -3,7 +3,6 @@ let
 in
 {
   imports = [
-<<<<<<< HEAD
     ./udev.nix
     "${modulesPath}/podman.nix"
     "${modulesPath}/homeassistant.nix"
@@ -17,20 +16,5 @@ in
     "${modulesPath}/dhcp-proxy.nix"
     "${modulesPath}/matter-bridge.nix"
     "${modulesPath}/music-assistant.nix"
-||||||| parent of a04b0c9 (rev zigbee)
-    ./udev.nix
-    "${modulesPath}/podman.nix"
-    "${modulesPath}/homeassistant.nix"
-    "${modulesPath}/avahi-daemon.nix"
-    "${modulesPath}/podman-network.nix"
-    "${modulesPath}/bluetooth.nix"
-    "${modulesPath}/sudo.nix"
-    "${modulesPath}/nfs.nix"
-    "${modulesPath}/zigbee2mqtt.nix"
-    "${modulesPath}/zwave.nix"
-    "${modulesPath}/dhcp-proxy.nix"
-=======
-
->>>>>>> a04b0c9 (rev zigbee)
   ];
-}
+}

nixos/modules/homeassistant.nix

@@ -11,7 +11,7 @@ let
     PATH=$PATH:/run/current-system/sw/bin
 
     # Define version variable
-    VERSION="2024.8.2"
+    VERSION="2024.10.0"
 
     # Define the container ID file path
     CIDFILE="/var/run/$SERVICE/$SERVICE.ctr-id"