On Tue, 27 Apr 2004 [EMAIL PROTECTED] wrote: > clar 2004/04/27 11:22:27 > > Log: > no message > > Status: > > Vendor Tag: avendor > Release Tags: arelease > > C httpd-2.0/VERSIONING > C httpd-2.0/config.layout > C httpd-2.0/ROADMAP > C httpd-2.0/LAYOUT > C httpd-2.0/LICENSE > C httpd-2.0/.gdbinit > C httpd-2.0/NOTICE > ... > > 2064 conflicts created by this import. > Use the following command to help the merge:
Um, what just happened? :-)
