A git conflict slipped into the repo, fixing

2017-11-29 11:38:14 -08:00 · 2017-11-29 11:38:14 -08:00 · c0c3b769f2
commit c0c3b769f2
parent fae39dd2e5
1 changed files with 2 additions and 8 deletions
--- a/framework/build.gradle
+++ b/framework/build.gradle
@ -129,15 +129,9 @@ bintray {
        licenses = ['Apache-2.0']
        labels = ['android', 'cordova', 'phonegap']
        version {
-<<<<<<< HEAD
-            name = '6.4.0'
+            name = '6.4.1-dev'
            released  = new Date()
-            vcsTag = '6.4.0'
-=======
-            name = '6.5.0-dev'
-            released  = new Date()
-            vcsTag = '6.5.0-dev'
->>>>>>> master
+            vcsTag = '6.4.1-dev'
        }
    }
 }