You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@httpd.apache.org by Aram Mirzadeh <aw...@qosina.com> on 1996/06/02 06:31:55 UTC

cvs problem


Anyone know what this is: 

....
....
U apache/src/mod_auth_anon.c
RCS file: /export/home/cvs/apache/src/mod_auth_msql.c,v
retrieving revision 1.4
retrieving revision 1.6
Merging differences between 1.4 and 1.6 into mod_auth_msql.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in apache/src/mod_auth_msql.c
C apache/src/mod_auth_msql.c
U apache/src/mod_cgi.c
....
....

<Aram>
-- 
Aram Mirzadeh						awm@qosina.com
MIS Manager				      Apache httpd team member
Qosina Corporation				    aram@hyperreal.com
http://www.qosina.com/			    http://www.qosina.com/~awm

You're not drunk if you can lie on the floor without holding on.
                -- Dean Martin