umagesh 2002/06/22 16:46:51
Modified: . WHATSNEW
Log:
Remove conflict resolution cruft.
Revision Changes Path
1.269 +0 -1 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- WHATSNEW 22 Jun 2002 23:38:27 -0000 1.268
+++ WHATSNEW 22 Jun 2002 23:46:50 -0000 1.269
@@ -313,7 +313,6 @@
--------------------------------------------
* Important: Single $ signs are no longer silently stripped!
->>>>>>> 1.263.2.51
Before you panic that we have broken all your build files, we have kept
the old "$$" -> "$" behaviour. So only build files which accidentally had
a $ sign in a string that was being silently stripped may break.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>