From b52b4a93fde83bf35029b54526257a78595e29ec Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 9 Apr 1999 18:04:31 +0000
Subject: *** empty log message ***

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

diff --git a/ChangeLog b/ChangeLog
index 061d3e05d7..3cc4dd5b07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,7 +72,6 @@ Tue Feb 16 23:42:51 1999  Yasuhiro Fukuma  <yasuf@big.or.jp>
 
 	* configure.in: FreeBSD objformat patch
 
->>>>>>> 1.1.1.2.2.163
 Tue Feb 16 12:40:55 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* version 1.2.3 (stable) released.
-- 
cgit v1.2.3