Remove merge conflict tag

2013-12-02 20:51:57 -05:00
parent fadb170e50
commit 65ee3d142f
1 changed files with 0 additions and 1 deletions
@@ -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">