1 files changed, 8 insertions, 2 deletions
diff --git a/tiapp.xml b/tiapp.xml
index 4b18934..d1ddbe3 100644
--- a/tiapp.xml
+++ b/tiapp.xml
@@ -13,14 +13,20 @@
         <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>TW</publisher>
+    <publisher>ZANT</publisher>
     <url>http://</url>
     <description>not specified</description>
-    <copyright>2012 by TW</copyright>
+    <copyright>2012 by ZANT</copyright>
     <icon>appicon.png</icon>
     <persistent-wifi>false</persistent-wifi>
     <prerendered-icon>true</prerendered-icon>