Resolve merge conflicts

2016-10-27 19:03:37 +02:00
parent f242d80c16 c389e543d0
commit 0dbe067ade
89 changed files with 2152 additions and 1657 deletions
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -287,6 +287,10 @@ android {
        exclude 'META-INF/NOTICE'
        exclude '.readme'
    }
+
+    dataBinding {
+        enabled = true
+    }
 }

 task jacocoTestReport(type:JacocoReport, dependsOn: "testFdroidDebugWithTestCoverageUnitTest") {