Re: Conflict in debian-installer/tools/base-installer/debian/

2003-10-28 Thread Gaudenz Steinlin
Am Mon, den 27.10.2003 schrieb Petter Reinholdtsen um 23:44: > Please clean up the conflict you commited, and make it a habit to use > 'cvs diff -u' before you commit: Done, sorry about that gaudenz -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact

Conflict in debian-installer/tools/base-installer/debian/

2003-10-27 Thread Petter Reinholdtsen
Please clean up the conflict you commited, and make it a habit to use 'cvs diff -u' before you commit: > Index: kernel-installer.postinst > === > RCS file: > /cvs/debian-boot/debian-installer/tools/base-installer/debian/kernel-instal