A git conflict slipped into the repo, fixing

Merge branch 'master' into 6.4.x
Merging all non-StudioProjectCompat work into the 6.4.x branch for possible 6.x, or 6.4.x work in the future.
2017-11-29 11:38:14 -08:00 · 2017-11-28 10:39:54 -08:00 · 2017-11-06 11:44:20 -08:00 · 2017-11-06 11:44:19 -08:00
5 changed files with 8 additions and 8 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-6.5.0-dev
+6.4.1-dev
--- a/bin/templates/cordova/version
+++ b/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;

--- a/bin/templates/project/assets/www/cordova.js
+++ b/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');

-})();
+})();
--- a/framework/build.gradle
+++ b/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'
        }
    }
 }
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/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);
Author	SHA1	Message	Date
Joe Bowser	c0c3b769f2	A git conflict slipped into the repo, fixing	2017-11-29 11:38:14 -08:00
Joe Bowser	fae39dd2e5	Merge branch 'master' into 6.4.x Merging all non-StudioProjectCompat work into the 6.4.x branch for possible 6.x, or 6.4.x work in the future.	2017-11-28 10:39:54 -08:00
Joe Bowser	7a27ee4f69	Set VERSION to 6.4.0 (via coho)	2017-11-06 11:44:20 -08:00
Joe Bowser	cc13413007	Update JS snapshot to version 6.4.0 (via coho)	2017-11-06 11:44:19 -08:00