From ccf73d0da61166a3224dc065cbeff7a6a09bbf86 Mon Sep 17 00:00:00 2001 From: "atp (Open ERP)" Date: Thu, 23 Dec 2010 15:38:20 +0530 Subject: [PATCH] [REM]: Remove conflict after Merge bzr revid: atp@tinyerp.co.in-20101223100820-ctvvmg3so6e0rk69 --- addons/caldav/wizard/calendar_event_import.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/caldav/wizard/calendar_event_import.py b/addons/caldav/wizard/calendar_event_import.py index fe2d1d78c28..f8adf173270 100644 --- a/addons/caldav/wizard/calendar_event_import.py +++ b/addons/caldav/wizard/calendar_event_import.py @@ -83,7 +83,7 @@ class calendar_event_import(osv.osv_memory): } _defaults = { - 'msg': lambda cr, uid, ids, context: _('Import Sucessful') + 'msg': _get_msg, } calendar_event_import()