1. Moises Henriquez
  2. vpackager

Commits

Moises Henriquez  committed 913f705

fixed coflicts

  • Participants
  • Parent commits c6b3fe8
  • Branches default

Comments (0)

Files changed (1)

File bot.py

View file
             self._refresh_views()
             if result == "Success" and toinstall == "1":
                 # install the package
-<<<<<<< local
-                print 'we should be installing this package here'
-=======
                 self.parent._play_output(
                         '\nInstalling package \n')
                 try:
                 except:
                     print 'Error while installing package'
                     pass
->>>>>>> other
 
 class Tab(gtk.VBox):
     ''' Generic tab for use in the tabstrip '''
         self.mon_thread.start()
         self.jobDispatcher = Dispatcher(parent = self._parent)
 
-<<<<<<< local
-=======
-
->>>>>>> other
     def __bot_monitor(self):
         while self._parent._bot_run:
             gtk.gdk.threads_enter()