--------------------- PatchSet 8076 Date: 2006/05/29 20:38:39 Author: serassio Branch: nt Tag: (none) Log: Fixed merge error Members: lib/md5.c:1.9.8.2->1.9.8.3 Index: squid/lib/md5.c =================================================================== RCS file: /cvsroot/squid-sf//squid/lib/md5.c,v retrieving revision 1.9.8.2 retrieving revision 1.9.8.3 diff -u -r1.9.8.2 -r1.9.8.3 --- squid/lib/md5.c 29 May 2006 18:41:17 -0000 1.9.8.2 +++ squid/lib/md5.c 29 May 2006 20:38:39 -0000 1.9.8.3 @@ -248,3 +248,4 @@ } #endif +#endif