[REM] conflict leftover

bzr revid: fme@openerp.com-20140128183644-8wxgd1nwjrbcgwjt
2014-01-28 19:36:44 +01:00
parent 107f2ada55
commit e54cb0291a
1 changed files with 0 additions and 1 deletions
@@ -86,7 +86,6 @@ class report_event_registration(osv.osv):
                e.seats_max,
                e.main_speaker_id,
                e.register_max,
->>>>>>> MERGE-SOURCE
                name_registration
        )
        """)