nitta-lab-2024:master
nitta-lab-2024:favoritesFragment
# Conflicts: # app/src/main/java/com/example/citrusclient/rest/FavoritesRest.java # app/src/main/java/com/example/citrusclient/viewmodels/FavoritesViewModel.java