[IMP] remove conflict
This commit is contained in:
parent
9586d204ff
commit
7675f64d15
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<odoo>
|
<odoo>
|
||||||
<data noupdate="0">
|
<data noupdate="1">
|
||||||
<record id="event_subscription" model="mail.template">
|
<record id="event_subscription" model="mail.template">
|
||||||
<field name="name">Event: Change in Tracks</field>
|
<field name="name">Event: Change in Tracks</field>
|
||||||
<field name="model_id" ref="event.model_event_registration"/>
|
<field name="model_id" ref="event.model_event_registration"/>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue