commit a8060219d5aa22b17c2f5ed0a1eb109ec68dc3da
author Steven Gill <stevengill97@gmail.com> Mon Oct 28 12:13:43 2013 -0700
committer Steven Gill <stevengill97@gmail.com> Mon Oct 28 12:13:43 2013 -0700
tree 2823aea7b4d6ef9ddfa7db7adb3daa4df388907f
parent 4d4d479b3c0467da69911b960bbf47ca6a80c897
parent e5868f8ecb0bd1f1a7a4fd868a437efab7dd020a

fixed merge conflict

RELEASENOTES.md

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index a85c6d6..5ad2e29 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -48,3 +48,4 @@
 * CB-3747 Fix back button having different dismiss logic from the close button.
 * CB-5021 Expose closeDialog() as a public function and make it safe to call multiple times.
 * CB-5021 Make it safe to call close() multiple times
+>>>>>>> dev

plugin.xml

diff --git a/plugin.xml b/plugin.xml
index d0f2bf4..94cfb82 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -3,6 +3,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="org.apache.cordova.inappbrowser"
       version="0.2.4">
+
     <name>InAppBrowser</name>
     <description>Cordova InAppBrowser Plugin</description>
     <license>Apache 2.0</license>