[7/9] cordova-plugin-screen-orientation git commit: Fixes CB-12427

[pu...@apache.org]

 Fixes CB-12427


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/commit/4d6d8b45
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/tree/4d6d8b45
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/diff/4d6d8b45

Branch: refs/heads/master
Commit: 4d6d8b45ee1bc28a18e5d6243760423450c86626
Parents: 71075a1
Author: maverickmishra <vi...@gmail.com>
Authored: Tue Feb 7 15:30:52 2017 -0800
Committer: maverickmishra <vi...@gmail.com>
Committed: Mon Feb 13 16:20:45 2017 -0800

----------------------------------------------------------------------
 README.md | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/blob/4d6d8b45/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 1b0c674..770d399 100644
--- a/README.md
+++ b/README.md
@@ -103,7 +103,6 @@ The __screen.orientation__ property will not update when the phone is [rotated 1
 
 Wraps the com.blackberry.app plugin functions, auto installed as a dependancy.
 
-<<<<<<< HEAD
 ## WP8 Notes
 
 Windows phone does not support specification or primary and secondary orientations.  If called with a specific orientation the plugin will just apply the landscape or portait orientation.


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