commit 01538193187f43903c2ecf40221e921279ca99b1
author Steve Gill <stevengill97@gmail.com> Mon Oct 16 15:33:52 2017 -0700
committer Steve Gill <stevengill97@gmail.com> Mon Oct 16 15:33:52 2017 -0700
tree 5f5bc69b06a811b49060d8363050ba89ba36ff3a
parent 6e9cb1f7c6207f176707b9ddb05c2c87c87027d3
parent 2444d6063086d109a92630d4038e84c942ec2c96

CB-13444: fixed merge conflict

bin/template/cordova/version

diff --git a/bin/template/cordova/version b/bin/template/cordova/version
index bde86e6..7ab09ce 100755
--- a/bin/template/cordova/version
+++ b/bin/template/cordova/version
@@ -20,6 +20,6 @@
 */
 
 // Coho updates this line:
-var VERSION = "5.1.0-dev";
+var VERSION = "5.0.1";
 
 console.log(VERSION);

cordova-lib/cordova.js

diff --git a/cordova-lib/cordova.js b/cordova-lib/cordova.js
index 8ef5cbe..4ac61ed 100644
--- a/cordova-lib/cordova.js
+++ b/cordova-lib/cordova.js
@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '5.1.0-dev';
+var PLATFORM_VERSION_BUILD_LABEL = '5.0.1';
 // file: src/scripts/require.js
 
 /*jshint -W079 */
@@ -1880,4 +1880,4 @@
 
 require('cordova/init');
 
-})();
\ No newline at end of file
+})();