cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject cordova-plugin-device git commit: fix merge conflict, for reals
Date Thu, 22 Oct 2015 23:16:39 GMT
Repository: cordova-plugin-device
Updated Branches:
  refs/heads/master 370cbd64c -> 1b6f59fd2


fix merge conflict, for reals


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/commit/1b6f59fd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/tree/1b6f59fd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/diff/1b6f59fd

Branch: refs/heads/master
Commit: 1b6f59fd2b684fe1c62176f36d8b9b6409325937
Parents: 370cbd6
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Thu Oct 22 16:08:45 2015 -0700
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Thu Oct 22 16:10:11 2015 -0700

----------------------------------------------------------------------
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-device/blob/1b6f59fd/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 23f2c2a..34e099f 100644
--- a/README.md
+++ b/README.md
@@ -215,7 +215,6 @@ Get the operating system version.
     // Windows Phone 7: returns current OS version number, ex. on Mango returns 7.10.7720
     // Tizen: returns "TIZEN_20120425_2"
     var deviceVersion = device.version;
-<<<<<<< HEAD
 
 ## device.isVirtual
 
@@ -228,5 +227,4 @@ whether the device is running on a simulator.
 - Android 2.1+
 - iOS
 - Windows Phone 8
-=======
->>>>>>> 0d82bc984174c34a4e2ff5dc08020c21d7bc27a1
+


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message