Updated version number, more build clean up

freshollie · Dec 6, 2017 · afd18f3 · afd18f3
1 parent 65ec21b
commit afd18f3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId 'com.freshollie.monkeyboard.keystoneradio'
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 100
-        versionName "Beta 2.1.1"
+        versionCode 112
+        versionName "Beta 2.1.2"
     }
     buildTypes {
         release {

diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,6 @@
 buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,9 +1,6 @@
 #Sun Nov 05 13:16:17 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
->>>>>>>=master
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
-=\=\=\=\=\=\=
-<<<<<<<=HEAD