diff --git a/addons/account/account_wizard.xml b/addons/account/account_wizard.xml index 70d63123a36..525fa46607a 100644 --- a/addons/account/account_wizard.xml +++ b/addons/account/account_wizard.xml @@ -89,13 +89,13 @@ -<<<<<<< TREE + -======= + ->>>>>>> MERGE-SOURCE +