ChangeLog: conflict mark removed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14435 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-12-21 15:59:24 +00:00 · 2007-12-21 15:59:24 +00:00 · 3edf43c4cf
--- a/1
+++ b/1
@ -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.