diff options
| author | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-07-11 17:22:22 +0530 |
|---|---|---|
| committer | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-07-11 17:22:22 +0530 |
| commit | 14beea5700fe97d148f720b6c6942d2d38ff5a2d (patch) | |
| tree | 459406745e03b36044760951223a80188a9a2e28 /addons/wiki/wizard/wiki_show_diff_view.xml | |
| parent | 8a847dcf5e6e1dc85c29504fc352e873f63cc51d (diff) | |
| parent | 79a8450b72f4b23c6b5e86ac69502a49f881fccc (diff) | |
[MERGE] merge with parent branch
bzr revid: cha@tinyerp.com-20120711115222-9hzmeove3ly2e5bm
Diffstat (limited to 'addons/wiki/wizard/wiki_show_diff_view.xml')
| -rw-r--r-- | addons/wiki/wizard/wiki_show_diff_view.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml index c5b3583b1e5..4729586c858 100644 --- a/addons/wiki/wizard/wiki_show_diff_view.xml +++ b/addons/wiki/wizard/wiki_show_diff_view.xml @@ -10,11 +10,11 @@ <field name="type">form</field> <field name="arch" type="xml"> <form string="Difference" version="7.0"> - <header> - <button string="Cancel" class="oe_link" special="cancel" /> - </header> <separator string="Notes"/> <field name="file_path" width="300"/> + <footer> + <button string="Cancel" class="oe_link" special="cancel" /> + </footer> </form> </field> </record> |