Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
Diffstat (limited to 'shell')
-rw-r--r--shell/StartPage.py1
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)