From 9a9a139780c6deb822811e2dc799ba6d9cc8ffc6 Mon Sep 17 00:00:00 2001
From: dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 29 Jan 2004 13:44:48 +0000
Subject: Remove conflict from Changelog

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 40c26d883..3a1ed3f8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,7 +28,6 @@ Thu Jan 29 17:03:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* dir.c: merge tuning from H.Yamamoto <ocean@m2.ccsnet.ne.jp>.
 	  [ruby-dev:22761]
 
->>>>>>> 1.2844
 Thu Jan 29 11:32:14 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* test/rss/test_*: do $: trick while searching a module in the current
-- 
cgit