cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [08/11] git commit: Remove merge conflict tag
Date Thu, 05 Dec 2013 00:59:20 GMT
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/master
Commit: 65ee3d142fa04381c455bfab7514f326f083e553
Parents: fadb170
Author: Ian Clelland <iclelland@chromium.org>
Authored: Mon Dec 2 20:51:57 2013 -0500
Committer: Ian Clelland <iclelland@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">


Mime
View raw message