[FIX] bad merge

bzr revid: fp@openerp.com-20120522180936-tzzmbc7ypfd471o3

1 files changed, 1 insertions, 14 deletions

diff --git a/addons/marketing_campaign/marketing_campaign.py b/addons/marketing_campaign/marketing_campaign.py
index 71e680cd2bc..1e87925bdf3 100644
--- a/addons/marketing_campaign/marketing_campaign.py
+++ b/addons/marketing_campaign/marketing_campaign.py
@@ -115,15 +115,9 @@ With Manual Confirmation - the campaigns runs normally, but the user has to vali
 Normal - the campaign runs normally and automatically sends all emails and reports (be very careful with this mode, you're live!)"""),
         'state': fields.selection([('draft', 'New'),
                                    ('running', 'Running'),
-<<<<<<< TREE
                                    ('cancelled', 'Cancelled'),
                                    ('done', 'Done')],
-                                   'State',),
-=======
-                                   ('done', 'Done'),
-                                   ('cancelled', 'Cancelled'),],
                                    'Status',),
->>>>>>> MERGE-SOURCE
         'activity_ids': fields.one2many('marketing.campaign.activity',
                                        'campaign_id', 'Activities'),
         'fixed_cost': fields.float('Fixed Cost', help="Fixed cost for running this campaign. You may also specify variable cost and revenue on each campaign activity. Cost and Revenue statistics are included in Campaign Reporting.", digits_compute=dp.get_precision('Purchase Price')),
@@ -654,18 +648,11 @@ class marketing_campaign_workitem(osv.osv):
         'res_name': fields.function(_res_name_get, string='Resource Name', fnct_search=_resource_search, type="char", size=64),
         'date': fields.datetime('Execution Date', help='If date is not set, this workitem has to be run manually', readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', select=1, readonly=True),
-<<<<<<< TREE
         'state': fields.selection([ ('todo', 'To Do'),
                                     ('cancelled', 'Cancelled'),
                                     ('exception', 'Exception'),
                                     ('done', 'Done'),
-                                   ], 'State', readonly=True),
-=======
-        'state': fields.selection([('todo', 'To Do'),
-                                   ('exception', 'Exception'), ('done', 'Done'),
-                                   ('cancelled', 'Cancelled')], 'Status', readonly=True),
->>>>>>> MERGE-SOURCE
-
+                                   ], 'Status', readonly=True),
         'error_msg' : fields.text('Error Message', readonly=True)
     }
     _defaults = {