[Alex Bojer]

Index: kmail.po

RCS file: /var/lib/cvs/skolelinux/i18n/kde-i18n/no/messages/kdenetwork/kmail.po,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- kmail.po 20 Mar 2002 20:19:28 -0000 1.23 +++ kmail.po 20 Mar 2002 22:07:17 -0000 1.24 @@ -6,9 +6,11 @@ msgstr "" "Project-Id-Version: KDE NETWORK/kmail\n" "POT-Creation-Date: 2001-07-26 23:46+0200\n" -"PO-Revision-Date: 2002-03-20 20:47GMT\n" -"Last-Translator: Tormod Ravnanger Landet tormod@landet.net\n" -"Language-Team: Norsk bokmål no@li.org\n" +<<<<<<< kmail.po +"PO-Revision-Date: 2002-03-20 21:20GMT\n" +"Last-Translator: Axel Bojer axelb@start.no\n" +"Language-Team: Norwegian i18n.ping.developer@skolelinux.no\n"

Her er en uløst CVS-konflikt. Fila er nå korrupt.