flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-11-04 12:28:25 +00:00
Code Issues Releases Wiki Activity

Fix problem during rebase

Browse Source
This commit is contained in:
Abel García de Prada 2020-11-03 09:21:47 +01:00
parent f9ea701e2f
commit 6ea9f9996d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@ -1,7 +1,3 @@
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536M
<<<<<<< HEAD
=======
android.enableUnitTestBinaryResources=true
>>>>>>> use robolectric for android tests