Mercurial > hg > release > icedtea-1.9

changeset 1414:b259b240929b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove merge detritus.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 07 Nov 2008 15:53:48 +0000
parents df4bef3a43ee
children e58c66c7c2ee
files ChangeLog
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Nov 07 14:50:55 2008 +0000
+++ b/ChangeLog	Fri Nov 07 15:53:48 2008 +0000
@@ -182,8 +182,6 @@
 	* Makefile.am: Updated for new visualvm 1.0.1.
 	* patches/icedtea-visualvm.patch: Updated.
 
-=======
->>>>>>> other
 2008-10-29  Gary Benson  <gbenson@redhat.com>
 
 	PR icedtea/238: