You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2013/12/03 02:54:01 UTC
git commit: Remove merge conflict tag
Updated Branches:
refs/heads/dev fadb170e5 -> 65ee3d142
Remove merge conflict tag
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/commit/65ee3d14
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/tree/65ee3d14
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/diff/65ee3d14
Branch: refs/heads/dev
Commit: 65ee3d142fa04381c455bfab7514f326f083e553
Parents: fadb170
Author: Ian Clelland <ic...@chromium.org>
Authored: Mon Dec 2 20:51:57 2013 -0500
Committer: Ian Clelland <ic...@chromium.org>
Committed: Mon Dec 2 20:53:17 2013 -0500
----------------------------------------------------------------------
plugin.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-inappbrowser/blob/65ee3d14/plugin.xml
----------------------------------------------------------------------
diff --git a/plugin.xml b/plugin.xml
index e656ee7..8975a59 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -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">