diff options
| author | Fabien Meghazi <fme@openerp.com> | 2014-01-28 19:36:44 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-01-28 19:36:44 +0100 |
| commit | e54cb0291a5f342ca8ee24f4d93ee860b165fb1c (patch) | |
| tree | 97de607591bfb5230a1c81497dbd45ca9a99c11b | |
| parent | 107f2ada55fb8d6ea8afdbbc4af6c0cf813c3bbb (diff) | |
[REM] conflict leftover
bzr revid: fme@openerp.com-20140128183644-8wxgd1nwjrbcgwjt
| -rw-r--r-- | addons/event/report/report_event_registration.py | 1 |
1 files changed, 0 insertions, 1 deletions
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 ) """) |