From 0b46925bd6966f8b5f4b5692489aaf7d50a63859 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Sat, 30 Jun 2012 13:37:18 -0400
Subject: Merge

---
 tiapp.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tiapp.xml b/tiapp.xml
index d1ddbe3..a455030 100644
--- a/tiapp.xml
+++ b/tiapp.xml
@@ -13,15 +13,9 @@
         <target device="android">true</target>
         <target device="blackberry">false</target>
     </deployment-targets>
-<<<<<<< HEAD
     <sdk-version>1.6.2</sdk-version>
     <id>com.sphnx.Sphnx</id>
     <name>Sphnx</name>
-=======
-    <sdk-version>2.0.2.GA</sdk-version>
-    <id>com.likefeed.LikeFeed</id>
-    <name>LikeFeed</name>
->>>>>>> 4bcaa02ba3536316e32cb106ef2fc1a77f205b8b
     <version>1.0</version>
     <publisher>ZANT</publisher>
     <url>http://</url>
-- 
cgit v1.2.3