diff options
| author | Dan Williams <dcbw@redhat.com> | 2006-07-07 15:03:34 (GMT) |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2006-07-07 15:03:34 (GMT) |
| commit | 70965d03445539bf2eadb0769ea0ab4da971c39c (patch) | |
| tree | edb4b6891e98c099e929dba17a18043a0bfa1b68 /shell | |
| parent | fdd2ded8d8b5fd32fe5c0057e4dfc3edf377f8ca (diff) | |
Remove merge conflict junk
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/StartPage.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/shell/StartPage.py b/shell/StartPage.py index c9663c6..cfde804 100644 --- a/shell/StartPage.py +++ b/shell/StartPage.py @@ -173,7 +173,6 @@ class ActivitiesView(gtk.TreeView): Activity.create('com.redhat.Sugar.BrowserActivity', service, [ address ]) ->>>>>>> 63c93e4f2da2a5f8935835da876d118bdc99c495/shell/StartPage.py class StartPage(gtk.HBox): def __init__(self, activity_controller, ac_signal_object): gtk.HBox.__init__(self) |