From 65ee3d142fa04381c455bfab7514f326f083e553 Mon Sep 17 00:00:00 2001
From: Ian Clelland <iclelland@chromium.org>
Date: Mon, 2 Dec 2013 20:51:57 -0500
Subject: [PATCH] Remove merge conflict tag

---
 plugin.xml | 1 -
 1 file changed, 1 deletion(-)

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">