[REM]: Remove conflict after Merge

bzr revid: atp@tinyerp.co.in-20101223100820-ctvvmg3so6e0rk69
2010-12-23 15:38:20 +05:30
parent 5633f1b6ba
commit ccf73d0da6
1 changed files with 1 additions and 1 deletions
@@ -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()