zhaidi/cordova-plugin-inappbrowser
zhaidi/cordova-plugin-inappbrowser
1
0
Fork 0
forked from public/cordova-plugin-inappbrowser
Code Pull Requests Activity

Remove merge conflict tag

Browse Source
This commit is contained in:
Ian Clelland 2013-12-02 20:51:57 -05:00
parent fadb170e50
commit 65ee3d142f
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugin.xml
View File

@ -30,7 +30,6 @@
<source-file src="src/android/InAppBrowser.java" target-dir="src/org/apache/cordova/inappbrowser" /> <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" /> <source-file src="src/android/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" />
</platform> </platform>
<<<<<<< HEAD
<!-- amazon-fireos --> <!-- amazon-fireos -->
<platform name="amazon-fireos"> <platform name="amazon-fireos">