Fix problem during rebase

abelgardep · abelgardep · commit 6ea9f9996dd6 · 2021-03-02T10:34:39.000+01:00
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,3 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
-<<<<<<< HEAD
-=======
-android.enableUnitTestBinaryResources=true
->>>>>>> use robolectric for android tests
