From c28c18bff210e7873731780ff26104cd32cc6a29 Mon Sep 17 00:00:00 2001 From: Andre Weber Date: Tue, 21 Nov 2023 11:49:56 +0100 Subject: [PATCH] chore: Resolve Merge Conflicts --- .../companion/feature/light/viewmodel/LightControlViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/eclipse/kuksa/companion/feature/light/viewmodel/LightControlViewModel.kt b/app/src/main/java/org/eclipse/kuksa/companion/feature/light/viewmodel/LightControlViewModel.kt index 04a6094..a89d0ad 100644 --- a/app/src/main/java/org/eclipse/kuksa/companion/feature/light/viewmodel/LightControlViewModel.kt +++ b/app/src/main/java/org/eclipse/kuksa/companion/feature/light/viewmodel/LightControlViewModel.kt @@ -25,7 +25,7 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.lifecycle.ViewModel -import org.eclipse.kuksa.demo.R +import org.eclipse.kuksa.companion.R import org.eclipse.kuksa.vss.VssLights import org.eclipse.kuksa.vsscore.model.VssProperty