changeset in /hg/icedtea6: Remove merge detritus.

[Andrew John Hughes]

changeset b259b240929b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=b259b240929b
description:
	Remove merge detritus.

diffstat:

1 file changed, 2 deletions(-)
ChangeLog |    2 --

diffs (12 lines):

diff -r df4bef3a43ee -r b259b240929b ChangeLog
--- a/ChangeLog	Fri Nov 07 14:50:55 2008 +0000
+++ b/ChangeLog	Fri Nov 07 15:53:48 2008 +0000
@@ -182,8 +182,6 @@ 2008-10-31  Lillian Angel  <langel at redha
 	* Makefile.am: Updated for new visualvm 1.0.1.
 	* patches/icedtea-visualvm.patch: Updated.
 
-=======
->>>>>>> other
 2008-10-29  Gary Benson  <gbenson at redhat.com>
 
 	PR icedtea/238: