From 81ba8fd9fa0e2fbbee1ef3534a96104de4cd7079 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Wed, 17 Mar 2010 18:39:20 +0000
Subject: Merge branch 'master' of git://git.sugarlabs.org/turtleart/refactoring

Conflicts:
	NEWS
	activity/activity.info
	tagplay.py
	tawindow.py
---
(limited to 'activity/activity.info')

diff --git a/activity/activity.info b/activity/activity.info
index 880667a..bf8ea51 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,10 @@
 [Activity]
 name = Turtle Art
+<<<<<<< HEAD:activity/activity.info
 activity_version = 81
+=======
+activity_version = 83
+>>>>>>> f1d5ed75c29961a718eb3c59fde1663c184f20cf:activity/activity.info
 license = MIT
 bundle_id = org.laptop.TurtleArtActivity
 exec = sugar-activity TurtleArtActivity.TurtleArtActivity
--
cgit v0.9.1