Resolve merge conflict with social-backup-poc

This commit is contained in:
ameba23
2021-10-06 11:32:11 +02:00
33 changed files with 768 additions and 83 deletions

View File

@@ -34,6 +34,7 @@ buildscript {
classpath files('libs/gradle-witness.jar')
}
// ext.dagger_version = "2.33"
ext.junit_version = "4.12"
ext.jmock_version = '2.12.0'
}