WTF? ubuntu got automerged twice
This commit is contained in:
parent
9206d82df4
commit
736c8ddec0
@ -60,15 +60,6 @@
|
|||||||
<source-file src="src/amazon/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" />
|
<source-file src="src/amazon/InAppChromeClient.java" target-dir="src/org/apache/cordova/inappbrowser" />
|
||||||
</platform>
|
</platform>
|
||||||
|
|
||||||
<!-- ubuntu -->
|
|
||||||
<platform name="ubuntu">
|
|
||||||
<header-file src="src/ubuntu/inappbrowser.h" />
|
|
||||||
<source-file src="src/ubuntu/inappbrowser.cpp" />
|
|
||||||
<resource-file src="src/ubuntu/InAppBrowser.qml" />
|
|
||||||
<resource-file src="src/ubuntu/close.png" />
|
|
||||||
</platform>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ubuntu -->
|
<!-- ubuntu -->
|
||||||
<platform name="ubuntu">
|
<platform name="ubuntu">
|
||||||
<header-file src="src/ubuntu/inappbrowser.h" />
|
<header-file src="src/ubuntu/inappbrowser.h" />
|
||||||
|
Loading…
Reference in New Issue
Block a user