Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/activity
diff options
context:
space:
mode:
Diffstat (limited to 'activity')
-rw-r--r--activity/activity.info6
1 files changed, 1 insertions, 5 deletions
diff --git a/activity/activity.info b/activity/activity.info
index bf8ea51..fcfd782 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,10 +1,6 @@
[Activity]
name = Turtle Art
-<<<<<<< HEAD:activity/activity.info
-activity_version = 81
-=======
-activity_version = 83
->>>>>>> f1d5ed75c29961a718eb3c59fde1663c184f20cf:activity/activity.info
+activity_version = 84
license = MIT
bundle_id = org.laptop.TurtleArtActivity
exec = sugar-activity TurtleArtActivity.TurtleArtActivity