diff options
| author | Teddy Wing | 2012-06-30 13:37:18 -0400 |
|---|---|---|
| committer | Teddy Wing | 2012-06-30 13:37:18 -0400 |
| commit | 0b46925bd6966f8b5f4b5692489aaf7d50a63859 (patch) | |
| tree | a2b370c65b55c771aabf9c0f32d89280da077f30 /tiapp.xml | |
| parent | 9e7540760bbfe89eb31246fcb07c8a8fe8544278 (diff) | |
| download | LikeFeed-0b46925bd6966f8b5f4b5692489aaf7d50a63859.tar.bz2 | |
Merge
Diffstat (limited to 'tiapp.xml')
| -rw-r--r-- | tiapp.xml | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -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> |