chore: Resolve Merge Conflicts

eclipse-kuksa · Nov 21, 2023 · c28c18b · c28c18b
1 parent deda577
commit c28c18b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...rc/main/java/org/eclipse/kuksa/companion/feature/light/viewmodel/LightControlViewModel.kt b/...rc/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