A git conflict slipped into the repo, fixing

Merging all non-StudioProjectCompat work into the 6.4.x branch for
possible 6.x, or 6.4.x work in the future.

VERSION

@@ -1 +1 @@
-6.5.0-dev
+6.4.1-dev

bin/templates/cordova/version

@@ -20,7 +20,7 @@
 */
 
 // Coho updates this line:
-var VERSION = "6.5.0-dev";
+var VERSION = "6.4.1-dev";
 
 module.exports.version = VERSION;
 

bin/templates/project/assets/www/cordova.js

@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '6.5.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '6.4.1-dev';
 // file: src/scripts/require.js
 
 /* jshint -W079 */
@@ -2185,4 +2185,4 @@ window.cordova = require('cordova');
 
 require('cordova/init');
 
-})();
+})();

framework/build.gradle

@@ -42,7 +42,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 group = 'org.apache.cordova'
-version = '6.5.0-dev'
+version = '6.4.1-dev'
 
 android {
     compileSdkVersion cdvCompileSdkVersion
@@ -129,9 +129,9 @@ bintray {
         licenses = ['Apache-2.0']
         labels = ['android', 'cordova', 'phonegap']
         version {
-            name = '6.5.0-dev'
+            name = '6.4.1-dev'
             released  = new Date()
-            vcsTag = '6.5.0-dev'
+            vcsTag = '6.4.1-dev'
         }
     }
 }

framework/src/org/apache/cordova/CordovaWebView.java

@@ -31,7 +31,7 @@ import android.webkit.WebChromeClient.CustomViewCallback;
  * are not expected to implement it.
  */
 public interface CordovaWebView {
-    public static final String CORDOVA_VERSION = "6.5.0-dev";
+    public static final String CORDOVA_VERSION = "6.4.1-dev";
 
     void init(CordovaInterface cordova, List<PluginEntry> pluginEntries, CordovaPreferences preferences);