Merge branch 'develop' into refactor/viewmodel-to-uimodel

e3ed5627 · Filipe de Lima Brito · GitHub · 966c2057 · 70855e95 · e3ed5627
Unverified Commit e3ed5627 authored Jun 15, 2018 by Filipe de Lima Brito Committed by GitHub Jun 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

build.gradle app/build.gradle +1 -0

No files found.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -53,6 +53,7 @@ android {
    packagingOptions {
        exclude 'META-INF/core.kotlin_module'
+        exclude 'META-INF/main.kotlin_module'
    }
 }