From c8030c1160add54c9321911dbd36486832cb3d04 Mon Sep 17 00:00:00 2001
From: Rafael Ortiz <rafael@activitycentral.com>
Date: Tue, 18 Sep 2012 19:21:29 +0000
Subject: Merge branch 'Gtk3' of git.sugarlabs.org:stopwatch/stopwatch into gtk3

Conflicts:
	activity/activity.info
---
diff --git a/activity.py b/activity.py
index 2f17915..d254672 100644
--- a/activity.py
+++ b/activity.py
@@ -20,7 +20,7 @@
 import logging
 import telepathy
 
-from gi.repository import Gtk 
+from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GObject
 
@@ -44,7 +44,7 @@ class StopWatchActivity(Activity):
         self._logger = logging.getLogger('stopwatch-activity')
         
         GObject.threads_init()
-
+        
         from sugar3.activity.widgets import StopButton, \
                     ShareButton, TitleEntry, ActivityButton
 
@@ -60,7 +60,7 @@ class StopWatchActivity(Activity):
         try:
                 from sugar3.activity.widgets import DescriptionItem
                 description_item = DescriptionItem(self)
-                toolbar_box.toolbar.insert(description_item, -1) 
+                toolbar_box.toolbar.insert(description_item, -1)
                 description_item.show()
         except:
                 pass
--
cgit v0.9.1