cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [5/5] android commit: reverted accidental commits
Date Wed, 20 Aug 2014 23:30:46 GMT
reverted accidental commits


Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/8784ce45
Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/8784ce45
Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/8784ce45

Branch: refs/heads/3.5.x
Commit: 8784ce454c072b86360b1d8c87dcdf8c7df4609d
Parents: 2e65ac5
Author: Steven Gill <stevengill97@gmail.com>
Authored: Wed Aug 20 16:30:32 2014 -0700
Committer: Steven Gill <stevengill97@gmail.com>
Committed: Wed Aug 20 16:30:32 2014 -0700

----------------------------------------------------------------------
 framework/assets/www/cordova.js | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-android/blob/8784ce45/framework/assets/www/cordova.js
----------------------------------------------------------------------
diff --git a/framework/assets/www/cordova.js b/framework/assets/www/cordova.js
index b2103fb..b3934c3 100644
--- a/framework/assets/www/cordova.js
+++ b/framework/assets/www/cordova.js
@@ -1,5 +1,9 @@
 // Platform: android
+<<<<<<< HEAD
+// 3.5.1
+=======
 // 3.5.0
+>>>>>>> parent of 5ed35ee... Update JS snapshot to version 3.5.0 (via
coho)
 /*
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -19,7 +23,11 @@
  under the License.
 */
 ;(function() {
+<<<<<<< HEAD
+var CORDOVA_JS_BUILD_LABEL = '3.5.1';
+=======
 var CORDOVA_JS_BUILD_LABEL = '3.5.0';
+>>>>>>> parent of 5ed35ee... Update JS snapshot to version 3.5.0 (via
coho)
 // file: src/scripts/require.js
 
 /*jshint -W079 */


Mime
View raw message