merge conflicts

This commit is contained in:
Sem van der Hoeven
2020-12-14 14:36:52 +01:00
15 changed files with 597 additions and 0 deletions

View File

@@ -30,6 +30,12 @@ android {
dependencies {
def room_version = "2.2.5"
implementation "androidx.room:room-runtime:$room_version"
annotationProcessor "androidx.room:room-compiler:$room_version"
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'