From e54cb0291a5f342ca8ee24f4d93ee860b165fb1c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 28 Jan 2014 19:36:44 +0100 Subject: [PATCH] [REM] conflict leftover bzr revid: fme@openerp.com-20140128183644-8wxgd1nwjrbcgwjt --- addons/event/report/report_event_registration.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 84459f42fd9..6c2f4af3ad3 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -86,7 +86,6 @@ class report_event_registration(osv.osv): e.seats_max, e.main_speaker_id, e.register_max, ->>>>>>> MERGE-SOURCE name_registration ) """)