Ignore:
Timestamp:
Mar 5, 2018, 9:40:43 AM (3 years ago)
Author:
jrpelegrina
Message:

Clean svn trash in code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • bell-scheduler/trunk/fuentes/bell-scheduler/python3-bellscheduler/EditBox.py

    r6952 r6957  
    159159                self.sound_dc.set_sensitive(False)
    160160                self.sound_url.set_sensitive(False)
    161 <<<<<<< .mine
    162161                self.duration_entry.set_value(30)
    163162                self.init_threads()
    164 ||||||| .r6943
    165 =======
    166                 self.duration_entry.set_value(30)
    167 >>>>>>> .r6950
    168163
    169164        #def init_data_form     
Note: See TracChangeset for help on using the changeset viewer.