/hg/icedtea-web: Fix last merge of ChangeLog.

[dlila at icedtea.classpath.org]

changeset cea9ea395406 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=cea9ea395406
author: Denis Lila <dlila at redhat.com>
date: Thu Mar 31 14:35:01 2011 -0400

	Fix last merge of ChangeLog.


diffstat:

 ChangeLog |  1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diffs (11 lines):

diff -r a5cd63b3367c -r cea9ea395406 ChangeLog
--- a/ChangeLog	Thu Mar 31 14:01:04 2011 -0400
+++ b/ChangeLog	Thu Mar 31 14:35:01 2011 -0400
@@ -94,7 +94,6 @@
 	file.
 	(exceptionToString, show): New methods.
 
->>>>>>> /tmp/ChangeLog~other.ZwCGJe
 2011-03-29  Denis Lila <dlila at redhat.com>
 
 	* netx/net/sourceforge/jnlp/JNLPFile.java