You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by Peter Donald <pe...@apache.org> on 2002/04/02 23:21:49 UTC
Re: cvs commit: jakarta-avalon-excalibur/event build.xml
On Wed, 3 Apr 2002 07:23, bloritsch@apache.org wrote:
> 1.7.2.4 +5 -0 jakarta-avalon-excalibur/event/build.xml
>
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
> retrieving revision 1.7.2.3
> retrieving revision 1.7.2.4
> diff -u -r1.7.2.3 -r1.7.2.4
> --- build.xml 1 Apr 2002 11:57:27 -0000 1.7.2.3
> +++ build.xml 2 Apr 2002 21:23:37 -0000 1.7.2.4
> @@ -17,9 +17,14 @@
> <pathelement path="${java.class.path}"/>
> <pathelement location="${build.classes}"/>
> <pathelement location="${junit.jar}"/>
> +<<<<<<< build.xml
> + <pathelement location="${checkstyle.jar}"/>
> + <pathelement location="${excalibur-concurrent.jar}"/>
> +=======
> <pathelement location="${excalibur-collections.jar}"/>
> <pathelement location="${excalibur-concurrent.jar}"/>
> <pathelement location="${checkstyle.jar}"/>
> +>>>>>>> 1.7
> </path>
> <property name="cp" refid="project.class.path"/>
Theres some bad karma here!
--
Cheers,
Pete
---------------------------------------
Be nice to your friends. If it weren't
for them, you'd be a complete stranger.
---------------------------------------
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
RE: cvs commit: jakarta-avalon-excalibur/event build.xml
Posted by Berin Loritsch <bl...@apache.org>.
I'm sorry, I wasn't aware that CVS gave me a conflict for this
file.
> -----Original Message-----
> From: Peter Donald [mailto:peter@apache.org]
> Sent: Tuesday, April 02, 2002 4:22 PM
> To: Avalon Developers List
> Subject: Re: cvs commit: jakarta-avalon-excalibur/event build.xml
>
>
> On Wed, 3 Apr 2002 07:23, bloritsch@apache.org wrote:
> > 1.7.2.4 +5 -0 jakarta-avalon-excalibur/event/build.xml
> >
> > Index: build.xml
> >
> ===================================================================
> > RCS file: /home/cvs/jakarta-avalon-excalibur/event/build.xml,v
> > retrieving revision 1.7.2.3
> > retrieving revision 1.7.2.4
> > diff -u -r1.7.2.3 -r1.7.2.4
> > --- build.xml 1 Apr 2002 11:57:27 -0000 1.7.2.3
> > +++ build.xml 2 Apr 2002 21:23:37 -0000 1.7.2.4
> > @@ -17,9 +17,14 @@
> > <pathelement path="${java.class.path}"/>
> > <pathelement location="${build.classes}"/>
> > <pathelement location="${junit.jar}"/>
> > +<<<<<<< build.xml
> > + <pathelement location="${checkstyle.jar}"/>
> > + <pathelement location="${excalibur-concurrent.jar}"/>
> > +=======
> > <pathelement location="${excalibur-collections.jar}"/>
> > <pathelement location="${excalibur-concurrent.jar}"/>
> > <pathelement location="${checkstyle.jar}"/>
> > +>>>>>>> 1.7
> > </path>
> > <property name="cp" refid="project.class.path"/>
>
> Theres some bad karma here!
>
> --
> Cheers,
>
> Pete
>
> ---------------------------------------
> Be nice to your friends. If it weren't
> for them, you'd be a complete stranger.
> ---------------------------------------
>
> --
> To unsubscribe, e-mail:
> <mailto:avalon-dev-> unsubscribe@jakarta.apache.org>
> For
> additional commands,
> e-mail: <ma...@jakarta.apache.org>
>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>