[gnome-utils] Fix a conflict

[Kjartan Maraas <kmaraas src gnome org>]

commit 17aec35c3005e8bd240764505b0baf75116f2196
Author: Kjartan Maraas <kmaraas gnome org>
Date:   Wed Oct 14 22:16:06 2009 +0200

    Fix a conflict

 po/nb.po |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/po/nb.po b/po/nb.po
index 04a2ab5..aaa651f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-utils 2.27.x\n"
+"Project-Id-Version: gnome-utils 2.28.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-01 13:30+0200\n"
-"PO-Revision-Date: 2009-09-01 13:32+0200\n"
+"POT-Creation-Date: 2009-10-11 22:01+0200\n"
+"PO-Revision-Date: 2009-10-11 22:00+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
 "Language-Team: Norwegian/Bokmaal <i18n-nb lister ping uio no>\n"
 "MIME-Version: 1.0\n"