Index: ossp-pkg/pcre/pcre.c
RCS File: /v/ossp/cvs/ossp-pkg/pcre/pcre.c,v
rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/pcre/pcre.c,v' 2>/dev/null
--- pcre.c	2000/08/02 09:46:06	1.5
+++ pcre.c	2000/08/02 09:53:08	1.6
@@ -319,7 +319,6 @@
 
 
 /*************************************************
->>>>>>> ../arc/pcre-3.3/pcre.c
 *          Return version string                 *
 *************************************************/