@@ -24,11 +24,7 @@ android {
minSdkVersion 15
targetSdkVersion 26
versionCode 1
-<<<<<<< HEAD
versionName "1.47"
-=======
- versionName "1.43"
->>>>>>> 101e0c9955aaa42a57f45b21f4f890bb1540b288
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
