From 10c3e3b5a5b032b543645bb5499bbfaefcb00bb8 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Wed, 17 Mar 2010 19:05:09 +0000
Subject: new release

---
(limited to 'activity/activity.info')

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
--
cgit v0.9.1