From 3edf43c4cfe9df91ba30888fb631eec036595f88 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 21 Dec 2007 15:59:24 +0000
Subject: ChangeLog: conflict mark removed.

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

diff --git a/ChangeLog b/ChangeLog
index 0417dadc66..70779f5d5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -249,7 +249,6 @@ Fri Dec 21 12:45:49 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* string.c (rb_str_chomp_bang): avoid unnecessary loop using
 	  ONIGENC_LEFT_ADJUST_CHAR_HEAD().
 
->>>>>>> .r14423
 Fri Dec 21 12:32:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* file.c (Init_File): File.exists? revived.
-- 
cgit v1.2.3