sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove merge conflict junk

Browse Source
This commit is contained in:
Dan Williams 2006-07-07 11:03:34 -04:00
parent fdd2ded8d8
commit 70965d0344
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
shell/StartPage.py
View File

@ -173,7 +173,6 @@ class ActivitiesView(gtk.TreeView):
Activity.create('com.redhat.Sugar.BrowserActivity', service, [ address ]) Activity.create('com.redhat.Sugar.BrowserActivity', service, [ address ])
>>>>>>> 63c93e4f2da2a5f8935835da876d118bdc99c495/shell/StartPage.py
class StartPage(gtk.HBox): class StartPage(gtk.HBox):
def __init__(self, activity_controller, ac_signal_object): def __init__(self, activity_controller, ac_signal_object):
gtk.HBox.__init__(self) gtk.HBox.__init__(self)