Merge branch 'dev' of https://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser into dev

2013-12-03 13:50:16 -08:00
parent 8a549547cb 65ee3d142f
commit 30525d545a
1 changed files with 0 additions and 1 deletions
@@ -30,7 +30,6 @@
        <source-file src="src/android/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser" />
        <source-file src="src/android/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" />
    </platform>
-<<<<<<< HEAD
    
    <!-- amazon-fireos -->
    <platform name="amazon-fireos">