Skip to content
Sign in

Changes

Started by Pooja Ravi
Started 8 hr 48 min ago
Took 2 min 56 sec

Summary

  1. resolve merge conflicts (commit: 86f13a7) (details)
The file was modifiedrespect-app-compose/src/commonMain/kotlin/world/respect/app/view/learningunit/detail/LearningUnitDetailScreen.kt (diff)
The file was modifiedrespect-lib-shared/src/commonMain/composeResources/values/strings.xml (diff)
The file was modifiedrespect-app-compose/src/androidMain/kotlin/world/respect/AbstractAppActivity.kt (diff)
The file was modifiedrespect-app-compose/src/androidMain/kotlin/world/respect/AppKoinModule.kt (diff)
The file was modifiedrespect-lib-shared/src/commonMain/kotlin/world/respect/shared/viewmodel/manageuser/profile/SignupViewModel.kt (diff)
The file was modifiedrespect-lib-shared/src/commonMain/kotlin/world/respect/shared/navigation/AppRoutes.kt (diff)
The file was modifiedrespect-app-compose/src/androidMain/AndroidManifest.xml (diff)
The file was modifiedrespect-app-compose/src/commonMain/kotlin/world/respect/app/app/AppNavHost.kt (diff)
The file was modifiedrespect-lib-shared/src/commonMain/kotlin/world/respect/shared/viewmodel/manageuser/acceptinvite/AcceptInviteViewModel.kt (diff)
The file was modifiedrespect-app-compose/src/commonMain/kotlin/world/respect/app/app/App.kt (diff)