From e6f846c0e88522bc055ca8b53ca5136a016a14a3 Mon Sep 17 00:00:00 2001
From: Joenio Costa <joenio@colivre.coop.br>
Date: Fri, 6 Feb 2009 09:58:42 -0300
Subject: [PATCH] ActionItem918: oops: po/pt_BR/noosfero.po unmerged!

---
 po/pt_BR/noosfero.po | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/po/pt_BR/noosfero.po b/po/pt_BR/noosfero.po
index 40b51d3..44ede19 100644
--- a/po/pt_BR/noosfero.po
+++ b/po/pt_BR/noosfero.po
@@ -12,13 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: noosfero 0.13.0\n"
-<<<<<<< HEAD:po/pt_BR/noosfero.po
 "POT-Creation-Date: 2009-01-30 15:19-0300\n"
-"PO-Revision-Date: 2009-02-03 18:38-0300\n"
-=======
-"POT-Creation-Date: 2009-01-06 16:46-0300\n"
-"PO-Revision-Date: 2009-01-28 18:24-0300\n"
->>>>>>> ActionItem897-novo:po/pt_BR/noosfero.po
+"PO-Revision-Date: 2009-02-06 09:57-0300\n"
 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
--
libgit2 0.21.2