Кашин Максим
a4676f90eb
# Conflicts: # app/src/main/java/com/example/myapplication/api/MyServerService.kt # app/src/main/java/com/example/myapplication/database/AppViewModelProvider.kt # app/src/main/java/com/example/myapplication/database/entities/composeui/edit/BikeEdit.kt # app/src/main/java/com/example/myapplication/database/entities/composeui/edit/BikeEditViewModel.kt # app/src/main/java/com/example/myapplication/database/room/viewmodel/bike/BikeListViewModel.kt # app/src/main/java/com/example/myapplication/database/room/viewmodel/bike/BikeViewModel.kt # app/src/main/java/com/example/myapplication/database/room/viewmodel/cart/CartViewModel.kt # app/src/main/java/com/example/myapplication/database/room/viewmodel/item/ItemEditViewModel.kt # app/src/main/java/com/example/myapplication/database/room/viewmodel/item/ItemListViewModel.kt # app/src/main/java/com/example/myapplication/database/room/viewmodel/rent/RentListViewModel.kt # app/src/main/java/com/example/myapplication/database/room/viewmodel/rent/RentViewModel.kt # app/src/main/java/com/example/myapplication/database/room/viewmodel/rent/ReportViewModel.kt # app/src/main/java/com/example/myapplication/database/room/viewmodel/user/CurrentUserViewModel.kt # app/src/main/java/com/example/myapplication/database/room/viewmodel/user/EntryUserViewModel.kt # app/src/main/java/com/example/myapplication/database/room/viewmodel/user/RegisterUserViewModel.kt # app/src/main/java/com/example/myapplication/ui/edit/ItemEdit.kt # app/src/main/java/com/example/myapplication/ui/list/BikeList.kt # app/src/main/java/com/example/myapplication/ui/list/ItemList.kt # app/src/main/java/com/example/myapplication/ui/navigation/MainNavbar.kt # app/src/main/java/com/example/myapplication/ui/view/BikeView.kt # app/src/main/res/xml/network_security_config.xml # server/data.json