You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/06/28 17:07:33 UTC
[25/50] [abbrv] ios commit: updated cordova js file
updated cordova js file
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/c28b0b88
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/c28b0b88
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/c28b0b88
Branch: refs/heads/master
Commit: c28b0b88983eabffc64fb9f566ef9f17b56cf08b
Parents: 165b8be
Author: Steven Gill <st...@gmail.com>
Authored: Mon Jun 10 18:26:53 2013 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Jun 20 14:24:34 2013 -0700
----------------------------------------------------------------------
CordovaLib/cordova.js | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c28b0b88/CordovaLib/cordova.js
----------------------------------------------------------------------
diff --git a/CordovaLib/cordova.js b/CordovaLib/cordova.js
index b2fc871..4139a3d 100644
--- a/CordovaLib/cordova.js
+++ b/CordovaLib/cordova.js
@@ -1,5 +1,9 @@
// Platform: ios
+<<<<<<< HEAD
// 2.9.0rc1-0-g002f33d
+=======
+// 2.7.0rc1-84-g62c5786
+>>>>>>> updated cordova js file
/*
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 = '2.9.0rc1-0-g002f33d';
+=======
+var CORDOVA_JS_BUILD_LABEL = '2.7.0rc1-84-g62c5786';
+>>>>>>> updated cordova js file
// file: lib/scripts/require.js
var require,