1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bbba6104d6..594a677d5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -96,7 +96,6 @@ Sat Mar 20 21:21:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 	* ext/extmk.rb: rm -rf $extout, not extout.
 
->>>>>>> 1.3082
 Sat Mar 20 15:25:36 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Force