[FIX] estate: syntax error in manifest

Author: KAEI

estate/__manifest__.py

@@ -3,21 +3,13 @@
     'depends': ['base'],
     'application': True,
     'installable': True,
-<<<<<<< HEAD
-     'data': [
-=======
     'data': [
->>>>>>> e2f153c ([ADD] estate: Server Framework 101)
         'security/ir.model.access.csv',
         'views/estate_property_views.xml',
         'views/estate_property_type_views.xml',
         'views/estate_property_tag_views.xml',
         'views/estate_property_offer_views.xml',
         'views/res_user_views.xml',
         'views/estate_menus.xml',
-<<<<<<< HEAD
-        ]
-=======
     ]
->>>>>>> e2f153c ([ADD] estate: Server Framework 101)
 }

estate/views/estate_property_type_views.xml

@@ -12,7 +12,7 @@
             <field name="arch" type="xml">
                 <form>
                     <div>
-                        <button type="action" class="oe_stat_button" name="estate.estate_property_offer_action" string="Offers" icon="fa-money"/>
+                        <button type="action" class="oe_stat_button" name="estate_property_offer_action" string="Offers" icon="fa-money"/>
                     </div>
                     <sheet>       
                         <h1><field name="name"/></h1>