cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [1/2] cordova-plugin-screen-orientation git commit: remove merge-diff cruft that was missed
Date Tue, 13 Dec 2016 23:52:17 GMT
Repository: cordova-plugin-screen-orientation
Updated Branches:
  refs/heads/master fe3beaeda -> 24205e980


remove merge-diff cruft that was missed


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/defc7bcd
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/tree/defc7bcd
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/diff/defc7bcd

Branch: refs/heads/master
Commit: defc7bcd3eb9dc054fe7f5091f597168f26e1440
Parents: fe3beae
Author: Jesse MacFadyen <purplecabbage@gmail.com>
Authored: Tue Dec 13 15:50:12 2016 -0800
Committer: Jesse MacFadyen <purplecabbage@gmail.com>
Committed: Tue Dec 13 15:50:12 2016 -0800

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


http://git-wip-us.apache.org/repos/asf/cordova-plugin-screen-orientation/blob/defc7bcd/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index fe022b0..658fcc5 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ Windows 8.1 Applicaitons (runtime/metro applications) will only display
orientat
 # Legacy Changelog
 
 See [RELEASENOTES.md](RELEASENOTES.md) for the automated changelog.
-=======
+
 # Changelog
 
 ## 2.0.0
@@ -119,7 +119,6 @@ See [RELEASENOTES.md](RELEASENOTES.md) for the automated changelog.
 
 ## 1.4.2
 * [#101](https://github.com/gbenvenuti/cordova-plugin-screen-orientation/pull/101) make iOS
rotate as needed when lockOrientation is called
->>>>>>> f2f2dbde729b9d3ac5884de6ee80ae354a3bf5ef
 
 ## 1.4.1
 * [#89](https://github.com/gbenvenuti/cordova-plugin-screen-orientation/pull/89) Fix for
cordova >= 3.6.3


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


Mime
View raw message