From de323bdccdbacd7a32b1a5546f81c0d4b25ecec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20D=2E=20D=C3=ADaz?=
 <alexandre.diaz@tecnativa.com>
Date: Tue, 26 Jan 2021 17:37:52 +0100
Subject: [PATCH] [IMP] Apply pre-commit changes: Resolve conflicts

---
 mail_tracking_mailgun/views/res_partner.xml | 48 ++++++++++++++++-----
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/mail_tracking_mailgun/views/res_partner.xml b/mail_tracking_mailgun/views/res_partner.xml
index 82ffd3e..8891839 100644
--- a/mail_tracking_mailgun/views/res_partner.xml
+++ b/mail_tracking_mailgun/views/res_partner.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2016 Tecnativa - Pedro M. Baeza
      Copyright 2016 Carlos Dauden - Tecnativa <carlos.dauden@tecnativa.com>
      Copyright 2017 Tecnativa <vicent.cubellsn@tecnativa.com>
@@ -8,18 +8,44 @@
     <record id="view_partner_form_mailgun" model="ir.ui.view">
         <field name="name">Partner Mailgun button</field>
         <field name="model">res.partner</field>
-        <field name="inherit_id" ref="mail_tracking.view_partner_form"/>
+        <field name="inherit_id" ref="mail_tracking.view_partner_form" />
         <field name="arch" type="xml">
             <field name="email_bounced" position="after">
-                <label for="check_email_bounced" string="Mailgun"
-                       attrs="{'invisible': [('email', '=', False)]}"/>
-                <div name="mailgun_buttons" attrs="{'invisible': [('email', '=', False)]}">
-                    <button name="check_email_bounced" type="object" string="Check Mailgun" class="oe_link"/>
-                    <button name="check_email_validity" type="object" string="Check email validity" class="oe_link"/>
-                    <button name="force_set_bounced" type="object" string="Set Bounced" class="oe_link"
-                            attrs="{'invisible': [('email_bounced', '=', True)]}"/>
-                    <button name="force_unset_bounced" type="object" string="Unset Bounced" class="oe_link"
-                            attrs="{'invisible': [('email_bounced', '=', False)]}"/>
+                <label
+                    for="check_email_bounced"
+                    string="Mailgun"
+                    attrs="{'invisible': [('email', '=', False)]}"
+                />
+                <div
+                    name="mailgun_buttons"
+                    attrs="{'invisible': [('email', '=', False)]}"
+                >
+                    <button
+                        name="check_email_bounced"
+                        type="object"
+                        string="Check Mailgun"
+                        class="oe_link"
+                    />
+                    <button
+                        name="check_email_validity"
+                        type="object"
+                        string="Check email validity"
+                        class="oe_link"
+                    />
+                    <button
+                        name="force_set_bounced"
+                        type="object"
+                        string="Set Bounced"
+                        class="oe_link"
+                        attrs="{'invisible': [('email_bounced', '=', True)]}"
+                    />
+                    <button
+                        name="force_unset_bounced"
+                        type="object"
+                        string="Unset Bounced"
+                        class="oe_link"
+                        attrs="{'invisible': [('email_bounced', '=', False)]}"
+                    />
                 </div>
             </field>
         </field>