From c0c3b769f2260870d90da75965985070831dcd1d Mon Sep 17 00:00:00 2001
From: Joe Bowser <bowserj@apache.org>
Date: Wed, 29 Nov 2017 11:38:14 -0800
Subject: [PATCH] A git conflict slipped into the repo, fixing

---
 framework/build.gradle | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/framework/build.gradle b/framework/build.gradle
index cd9e6d4c..1bd5941f 100644
--- 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'
         }
     }
 }