cleanup: merge conflict linting

mbta · Jan 10, 2025 · acb41b7 · acb41b7
1 parent ec12599
commit acb41b7
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/androidApp/src/main/java/com/mbta/tid/mbta_app/android/state/subscribeToPredictions.kt b/androidApp/src/main/java/com/mbta/tid/mbta_app/android/state/subscribeToPredictions.kt
@@ -3,7 +3,6 @@ package com.mbta.tid.mbta_app.android.state
 import android.util.Log
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.compose.LifecycleResumeEffect
@@ -145,7 +144,7 @@ fun subscribeToPredictions(
         onPauseOrDispose { viewModel.disconnect() }
     }
 
-        LaunchedEffect(key1 = timer) { viewModel.checkPredictionsStale() }
+    LaunchedEffect(key1 = timer) { viewModel.checkPredictionsStale() }
 
-        return viewModel
+    return viewModel
 }