Commit 3a5eaf0

committed

fix: resolve conflicts

1 parent 6a4500c commit 3a5eaf0Copy full SHA for 3a5eaf0

3 files changed

+80

-212

lines changed

app
- schemas/org.openedx.app.room.AppDatabase
  - 4.json
- src/main/java/org/openedx/app
  - AppActivity.kt
auth/src/main/java/org/openedx/auth/presentation/sso
- BrowserAuthHelper.kt

+80

-212

lines changed

Comments

(0)