From defc7bcd3eb9dc054fe7f5091f597168f26e1440 Mon Sep 17 00:00:00 2001
From: Jesse MacFadyen <purplecabbage@gmail.com>
Date: Tue, 13 Dec 2016 15:50:12 -0800
Subject: [PATCH] remove merge-diff cruft that was missed

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

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