From 49ea6cdddd420743b030da77feb116dcaed134d1 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageia.org>
Date: Sun, 7 Oct 2018 20:48:44 +0200
Subject: Update po catalogs

---
 po/pt_BR.po | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'po/pt_BR.po')

diff --git a/po/pt_BR.po b/po/pt_BR.po
index b8eb027..a939ac5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,15 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
 "POT-Creation-Date: 2018-04-05 19:36+0200\n"
 "PO-Revision-Date: 2018-03-21 16:33+0000\n"
 "Last-Translator: Michael Martins <michaelfm21@gmail.com>\n"
-=======
-"POT-Creation-Date: 2018-03-18 13:53+0200\n"
-"PO-Revision-Date: 2018-04-23 19:55+0000\n"
-"Last-Translator: Yves Brungard\n"
->>>>>>> b2769c42af94f1549780e9467778f4755b31d592
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/"
 "mageia/language/pt_BR/)\n"
 "Language: pt_BR\n"
-- 
cgit v1.2.1