[IMP]remove conflict

bzr revid: mma@tinyerp.com-20120524114346-wlvze80237fa37rt
2012-05-24 17:13:46 +05:30
parent 5a54d4c5dd
commit 33a108d34b
1 changed files with 0 additions and 7 deletions
@@ -207,17 +207,10 @@
                            <field colspan="4" name="notes" nolabel="1"/>
                        </page>
                    </notebook>
-<<<<<<< TREE
-                    </sheet>
-                    <div class="oe_form_sheet_width">
-                        <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
-                    </div>
-=======
                </sheet>
                <div class="oe_form_sheet_width">
                   <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
                </div>
->>>>>>> MERGE-SOURCE
                </form>
            </field>
        </record>