Someone(s) are not taking due care when committing... basic.wml:<<<<<<< basic.wml common_translation.wml:<<<<<<< common_translation.wml consultant.wml:<<<<<<< consultant.wml countries.wml:<<<<<<< countries.wml ctime.wml:<<<<<<< ctime.wml develbar.wml:<<<<<<< develbar.wml event.wml:<<<<<<< event.wml fixes_link.wml:<<<<<<< fixes_link.wml footer.wml:<<<<<<< footer.wml menubar.wml:<<<<<<< menubar.wml navbar.wml:<<<<<<< navbar.wml recent_list.wml:<<<<<<< recent_list.wml security.wml:<<<<<<< security.wml votebar.wml:<<<<<<< votebar.wml These files all have unresolved conflicts IN THE ARCHIVE. Please verify that 1) The changes you make build and look right 2) You execute cvs update before cvs commit -- Please cc all mailing list replies to me, also. ========================================================================= * http://benham.net/index.html <gecko@benham.net> <>< * * -------------------- * -----------------------------------------------* * Debian Developer, Debian Project Secretary, Debian Webmaster * * <gecko@debian.org> <secretary@debian.org> <lintian-maint@debian.org> * * <webmaster@debian.org> <gecko@fortunet.com> <webmaster@spi-inc.org> * =========================================================================
Attachment:
pgpIce9iBKWsT.pgp
Description: PGP signature