From f959dec61bea854ec368169ce729c2dd70d21779 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

---
 mass_mailing_partner/views/mailing_view.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mass_mailing_partner/views/mailing_view.xml b/mass_mailing_partner/views/mailing_view.xml
index f34b8a1..3ed5e65 100644
--- a/mass_mailing_partner/views/mailing_view.xml
+++ b/mass_mailing_partner/views/mailing_view.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2015 Pedro M. Baeza <pedro.baeza@tecnativa.com>
      Copyright 2015 Antonio Espinosa <antonio.espinosa@tecnativa.com>
      Copyright 2015 Javier Iniesta <javieria@antiun.com>
@@ -9,13 +9,13 @@
 <record model="ir.ui.view" id="mailing_list_view_form">
     <field name="name">mailing.list.form</field>
     <field name="model">mailing.list</field>
-    <field name="inherit_id" ref="mass_mailing.mailing_list_view_form"/>
+    <field name="inherit_id" ref="mass_mailing.mailing_list_view_form" />
     <field name="arch" type="xml">
         <xpath expr="//div[hasclass('oe_title')]" position="after">
             <group>
                 <group>
-                    <field name="partner_mandatory"/>
-                    <field name="partner_category"/>
+                    <field name="partner_mandatory" />
+                    <field name="partner_category" />
                 </group>
             </group>
         </xpath>