Mercurial > hg > release > icedtea-web-1.1

changeset 192:cea9ea395406

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix last merge of ChangeLog.
author Denis Lila <dlila@redhat.com>
date Thu, 31 Mar 2011 14:35:01 -0400
parents a5cd63b3367c
children 955da8a90b33
files ChangeLog
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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@redhat.com>
 
 	* netx/net/sourceforge/jnlp/JNLPFile.java