From 2665a49205a254b319fd055ab19d286b72569db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85smund=20Skj=C3=A6veland?= <aasmunds@fys.uio.no>
Date: Tue, 27 Jan 2004 07:48:03 +0000
Subject: [PATCH] Updated Norwegian Nynorsk translation. Removed leftover
 conflict
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2004-01-27  Åsmund Skjæveland  <aasmunds@fys.uio.no>

	* nn.po: Updated Norwegian Nynorsk translation.
	* ChangeLog: Removed leftover conflict indicator.
---
 po/ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/ChangeLog b/po/ChangeLog
index 6b9fa3da53..6ad77f09d9 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,7 +1,8 @@
 2004-01-27  Åsmund Skjæveland  <aasmunds@fys.uio.no>
 
 	* nn.po: Updated Norwegian Nynorsk translation.
-
+	* ChangeLog: Removed leftover conflict indicator.
+	
 2004-01-26  Nikos Charonitakis  <frolix68@yahoo.gr>
 
 	* el.po: Updated Greek translation.
@@ -68,7 +69,6 @@
 	* ru.po: Updated Russian translation
 	from Russian team <gnome-cyr@gnome.org>.
 
->>>>>>> 1.599
 2004-01-21  Artur Flinta  <aflinta@cvs.gnome.org>
 
 	* pl.po: Updated Polish translation by GNOME PL Team.