From 9146e09a4fcecda9420ff8f18d78241791b9d871 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 18 Oct 2004 07:14:03 +0000
Subject: [PATCH] * ChangeLog: remove a conflict tag

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9d166aad4f..797d41314c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,7 +75,6 @@ Sat Oct 16 13:34:56 2004  Kouhei Sutou  <kou@cozmixng.org>
 	* lib/rss: supported prety print.
 	* test/rss/test_1.0.rb: added test for calculating default indent size.
 
->>>>>>> 1.2673.2.531
 Fri Oct 15 18:04:35 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is