odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] product: fixed file whose conflicts markers where still alive. Alive bzr diff 

bzr revid: tde@openerp.com-20140116105508-qfxgox7rvo1ifjtj
This commit is contained in:
Thibault Delavallée 2014-01-16 11:55:08 +01:00
parent 9cf78e93cc
commit a00d24988f
1 changed files with 6 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
addons/product/product_image_demo.xml
View File

@ -19,51 +19,27 @@
</record>
<record id="product_product_4" model="product.product">
<<<<<<< TREE
<field name="image" type="base64" file="product/data/img/ipad.png"/>
=======
<field name="image" type="base64" file="product/static/img/product_product_4-image.jpg"/>
>>>>>>> MERGE-SOURCE
<field name="image" type="base64" file="product/static/img/product_product_4-image.png"/>
</record>
<record id="product_product_5" model="product.product">
<<<<<<< TREE
<field name="image" type="base64" file="product/data/img/bose.png"/>
=======
<field name="image" type="base64" file="product/static/img/product_product_5-image.jpg"/>
>>>>>>> MERGE-SOURCE
<field name="image" type="base64" file="product/static/img/product_product_5-image.png"/>
</record>
<record id="product_product_6" model="product.product">
<<<<<<< TREE
<field name="image" type="base64" file="product/data/img/ipad_mini.png"/>
=======
<field name="image" type="base64" file="product/static/img/product_product_6-image.jpg"/>
>>>>>>> MERGE-SOURCE
<field name="image" type="base64" file="product/static/img/product_product_6-image.png"/>
</record>
<record id="product_product_7" model="product.product">
<<<<<<< TREE
<field name="image" type="base64" file="product/data/img/accessory2.png"/>
=======
<field name="image" type="base64" file="product/static/img/product_product_7-image.png"/>
>>>>>>> MERGE-SOURCE
</record>
<record id="product_product_8" model="product.product">
<<<<<<< TREE
<field name="image" type="base64" file="product/data/img/imac.png"/>
=======
<field name="image" type="base64" file="product/static/img/product_product_8-image.jpg"/>
>>>>>>> MERGE-SOURCE
<field name="image" type="base64" file="product/static/img/product_product_8-image.png"/>
</record>
<record id="product_product_9" model="product.product">
<<<<<<< TREE
<field name="image" type="base64" file="product/data/img/apple_wireless_keyboard.png"/>
=======
<field name="image" type="base64" file="product/static/img/product_product_9-image.jpg"/>
>>>>>>> MERGE-SOURCE
<field name="image" type="base64" file="product/static/img/product_product_9-image.png"/>
</record>
<record id="product_product_10" model="product.product">
@ -71,11 +47,7 @@
</record>
<record id="product_product_11" model="product.product">
<<<<<<< TREE
<field name="image" type="base64" file="product/data/img/ipod.png"/>
=======
<field name="image" type="base64" file="product/static/img/product_product_11-image.jpg"/>
>>>>>>> MERGE-SOURCE
<field name="image" type="base64" file="product/static/img/product_product_11-image.png"/>
</record>
<record id="product_product_12" model="product.product">