Skip to content

Commit 2b1c7a5

Browse files
committed
feat : merge conflict 해결
1 parent 1cf5c94 commit 2b1c7a5

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

presentation/src/main/java/com/stop/ui/mission/MissionViewModel.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import androidx.lifecycle.*
44
import androidx.work.OneTimeWorkRequestBuilder
55
import androidx.work.WorkManager
66
import androidx.work.workDataOf
7-
import com.stop.domain.model.nowlocation.BusInfoUseCaseItem
87
import com.stop.domain.model.ApiChangedException
98
import com.stop.domain.model.AvailableTrainNoExistException
109
import com.stop.domain.model.nowlocation.BusCurrentInformationUseCaseItem

presentation/src/main/java/com/stop/ui/route/RouteFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class RouteFragment : Fragment() {
9494

9595
routeViewModel.lastTimeResponse.observe(viewLifecycleOwner) { event ->
9696
event.getContentIfNotHandled()?.let { response ->
97-
clickRouteViewModel.lastTimes = response
97+
routeViewModel.lastTimes = response
9898
binding.root.findNavController().navigate(R.id.action_routeFragment_to_routeDetailFragment)
9999
}
100100
}

0 commit comments

Comments
 (0)