From e4fa7a8688f83adc248e39f5cfabf6aa9fa8ac7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= <agdeprada@izertis.com>
Date: Tue, 3 Nov 2020 09:21:47 +0100
Subject: [PATCH] Fix problem during rebase

---
 gradle.properties | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 57264122..53ae0ae4 100644
--- 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