From 70965d03445539bf2eadb0769ea0ab4da971c39c Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 7 Jul 2006 11:03:34 -0400
Subject: [PATCH] Remove merge conflict junk

---
 shell/StartPage.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shell/StartPage.py b/shell/StartPage.py
index c9663c6d..cfde8045 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)