Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/activity/activity.info
diff options
context:
space:
mode:
authorSoaS user <liveuser@localhost.localdomain>2010-06-09 20:45:07 (GMT)
committer SoaS user <liveuser@localhost.localdomain>2010-06-09 20:45:07 (GMT)
commit6a853954f0e8e8ee69694a2c630902b7b524746a (patch)
tree1f91c9e1a7a56eb915769192fbe8d394f924f7e8 /activity/activity.info
parentbb86f24115c026c6f7439711a5b6cd20d6cc9f02 (diff)
Cosmetic change only
Diffstat (limited to 'activity/activity.info')
-rwxr-xr-xactivity/activity.info6
1 files changed, 1 insertions, 5 deletions
diff --git a/activity/activity.info b/activity/activity.info
index 1367981..fec563e 100755
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -5,11 +5,7 @@ name = OurMusic
bundle_id = org.laptop.OurMusic
icon = activity-ourmusic
-<<<<<<< HEAD
-activity_version = 4
-=======
-activity_version = 3
->>>>>>> 3690ed424760ca6ec230887465f1f2541c5c863a
+activity_version = 5
host_version = 1