Re: cvs commit: apr/test Makefile.in testapp.c testatomic.c testdir.c testenv.c testfile.c testfilecopy.c testfileinfo.c testflock.c testglobalmutex.c testlfs.c testlock.c testprocmutex.c testrand.c tests

[rbb]

On 7 Jun 2004 [EMAIL PROTECTED] wrote:

>    mod_test.la: mod_test.slo $(LOCAL_LIBS)
>   +<<<<<<< Makefile.in
>   +   $(LIBTOOL) --mode=link $(COMPILE) -rpath $(srcdir) -avoid-version 
> -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
>   +=======
>       $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` 
> -avoid-version -module mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
>   +>>>>>>> 1.159
>
>    libmod_test.la: mod_test.slo $(LOCAL_LIBS)
>       $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -rpath `pwd` 
> -avoid-version mod_test.lo $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@

You added some conflicts in here.  :-)

Ryan