![[Jenkins]](/jenkins/static/5bf9da80/images/svgs/logo.svg){kind=logo}
Summary
- resolve conflict (commit: 809cb7e) (details)
| The file was modified | app-ktor-server/src/main/kotlin/com/ustadmobile/lib/rest/UmRestApplication.kt (diff) |
| The file was modified | app-desktop/src/main/java/com/ustadmobile/port/desktop/DesktopDiModule.kt (diff) |
| The file was modified | core/src/jvmMain/kotlin/com/ustadmobile/core/domain/db/UmAppDatabaseMigration203_204.kt (diff) |