Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

2007-10-17 15:42:17 +02:00
parent 863af235b4 16d5afb66b
commit 8a7ed2da6d
5 changed files with 4 additions and 101 deletions
@@ -29,7 +29,6 @@ from sugar.graphics.xocolor import XoColor
 from sugar.graphics.roundbox import CanvasRoundBox
 from sugar.datastore import datastore
 from sugar import activity
-from sugar.objects import objecttype

 # TODO: Activities should request the Journal to open objectchooser dialogs. In
 # that way, we'll be able to reuse most of this code inside the Journal.