[Bjørn Steensrud]

Klar til vask

Det er en uløst konflikt her:

Revision Changes Path 1.12 +336 -473 skolelinux/i18n/head-kde-i18n/nb/messages/kdesdk/kbabel.po

Index: kbabel.po

[...]

msgid "" msgstr "" "Project-Id-Version: kbabel\n" +"<<<<<<< kbabel.po" +"POT-Creation-Date: 2002-08-14 02:56+0200\n" +"PO-Revision-Date: 2002-09-09 20:23+0200\n" +"Last-Translator: Bjørn Steensrud bjornst@powertech.no\n" +"Language-Team: Norwegian (Bokmål) i18n-nb@lister.ping.uio.no\n" +"=======" "POT-Creation-Date: 2002-08-27 02:54+0200\n" -"PO-Revision-Date: 2002-08-11 11:15+0200\n" -"Last-Translator: \n" -"Language-Team: nb@li.org\n" +"PO-Revision-Date: 2002-09-09 20:23+0200\n" +"Last-Translator: Bjørn Steensrud bjornst@powertech.no\n" +"Language-Team: Norwegian (Bokmål) i18n-nb@lister.ping.uio.no\n" +">>>>>>> 1.11" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0beta2\n"

Den bør fikses. Du unngår dette hvis du kjører 'cvs diff -u|less' før du sjekker inn, og ser over endringene.