---------------------
PatchSet 4377 
Date: 2007/04/25 08:54:08
Author: amosjeffries
Branch: nocpp
Tag: (none) 
Log:
cvs allow conflict to e saved. drop it out again.

Members: 
	lib/Makefile.am:1.17.2.2->1.17.2.3 

Index: squid3/lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/lib/Makefile.am,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -r1.17.2.2 -r1.17.2.3
--- squid3/lib/Makefile.am	25 Apr 2007 08:52:07 -0000	1.17.2.2
+++ squid3/lib/Makefile.am	25 Apr 2007 08:54:08 -0000	1.17.2.3
@@ -1,15 +1,10 @@
 ## Process this file with automake to produce Makefile.in
 #
-#  $Id: Makefile.am,v 1.17.2.2 2007/04/25 08:52:07 amosjeffries Exp $
+#  $Id: Makefile.am,v 1.17.2.3 2007/04/25 08:54:08 amosjeffries Exp $
 #
 
-<<<<<<< Makefile.am
-DIST_SUBDIRS = libTrie
-SUBDIRS= libTrie @SQUID_CPPUNIT_DIR@
-=======
 DIST_SUBDIRS = libTrie
 SUBDIRS= libTrie
->>>>>>> 1.19
 
 install: all
 install-strip: all