[FIX] chs stupidity
authorChristophe Simonis <chs@openerp.com>
Tue, 13 Dec 2011 16:27:30 +0000 (17:27 +0100)
committerChristophe Simonis <chs@openerp.com>
Tue, 13 Dec 2011 16:27:30 +0000 (17:27 +0100)
bzr revid: chs@openerp.com-20111213162730-w1p543ctjzpuf7f7

addons/web/static/src/xml/base.xml

index f42d173..0a245fe 100644 (file)
         t-att-id="widget.element_id"
         t-attf-class="field_#{widget.type}"
         style="width: 100%"
-<<<<<<< TREE
-    ></textarea>
-    <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='widget.session.server + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
-=======
-    ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" src="/web/static/src/img/icons/terp-translate.png" width="16" height="16" border="0"/>
->>>>>>> MERGE-SOURCE
+    ></textarea><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='widget.session.server + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
 </t>
 <t t-name="web.datetimepicker">
     <div class="oe_datepicker_root">
         <input type="text" size="1" style="width: 100%"
             t-att-name="widget.name"
             t-attf-class="oe_datepicker_master field_#{widget.type_of_date}"
-<<<<<<< TREE
-        />
-        <img class="oe_input_icon oe_datepicker_trigger" t-att-src='widget.session.server + "/web/static/src/img/ui/field_calendar.png"'
-=======
-        /><img class="oe_input_icon oe_datepicker_trigger" src="/web/static/src/img/ui/field_calendar.png"
->>>>>>> MERGE-SOURCE
+        /><img class="oe_input_icon oe_datepicker_trigger" t-att-src='widget.session.server + "/web/static/src/img/ui/field_calendar.png"'
              title="Select date" width="16" height="16" border="0"/>
     </div>
 </t>