Commit fa5f13a

committed

fix: resolve conflicts and unit test

1 parent 6a4500c commit fa5f13aCopy full SHA for fa5f13a

6 files changed

+125

-224

lines changed

app
- schemas/org.openedx.app.room.AppDatabase
  - 4.json
- src/main/java/org/openedx/app
  - AppActivity.kt
  - di
    - ScreenModule.kt
auth/src
- main/java/org/openedx/auth/presentation
  - signin
    - SignInViewModel.kt
  - sso
    - BrowserAuthHelper.kt
- test/java/org/openedx/auth/presentation/signin
  - SignInViewModelTest.kt

6 files changed

+125

-224

lines changed

Comments

(0)