[FIX] bad merge

bzr revid: fp@tinyerp.com-20120522162809-ip04ohnzpz39omzz
2012-05-22 18:28:09 +02:00
parent cec201b731
commit 58b4853c7e
1 changed files with 0 additions and 6 deletions
@@ -277,14 +277,8 @@ class marketing_campaign_segment(osv.osv):
        'state': fields.selection([('draft', 'New'),
                                   ('cancelled', 'Cancelled'),
                                   ('running', 'Running'),
-<<<<<<< TREE
                                   ('done', 'Done')],
-                                   'State',),
-=======
-                                   ('done', 'Done'),
-                                   ('cancelled', 'Cancelled')],
                                   'Status',),
->>>>>>> MERGE-SOURCE
        'date_run': fields.datetime('Launch Date', help="Initial start date of this segment."),
        'date_done': fields.datetime('End Date', help="Date this segment was last closed or cancelled."),
        'date_next_sync': fields.function(_get_next_sync, string='Next Synchronization', type='datetime', help="Next time the synchronization job is scheduled to run automatically"),