solve merge conflict

This commit is contained in:
Christian Schabesberger 2018-02-14 21:06:20 +01:00
commit 9427231035
8 changed files with 132 additions and 0 deletions

View file

@ -89,4 +89,8 @@ dependencies {
implementation 'frankiesardo:icepick:3.2.0'
annotationProcessor 'frankiesardo:icepick-processor:3.2.0'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
betaImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
}