Permalink
Browse files

package added

  • Loading branch information...
2 parents 07691ad + 7e9a838 commit a595bb986f92b2edaa7777de70a7eda127ec85d4 @jayrambhia committed Jun 4, 2012
Showing with 5 additions and 0 deletions.
  1. +5 −0 deskwid/deskwid.py
View
@@ -226,8 +226,13 @@ def get_timeline(self):
tweet_str = tweet_str + tweet + '\n'
gobject.idle_add(self.set_genview, tweet)
since_id = timeline[0].id
+<<<<<<< HEAD:deskwid/deskwid.py
print since_id
gobject.idle_add(self.change_genlabel, 'timeline')
+=======
+ gobject.idle_add(self.change_genlabel, 'timeline')
+ # print since_id
+>>>>>>> 7e9a838c0063c5023012521c641c1a867f43352a:deskwid.py
except :
# print 'Got some error'
gobject.idle_add(self.change_genlabel, 'Unable to fetch timeline')

0 comments on commit a595bb9

Please sign in to comment.