From e3155f4200b3567b323d788c15031004ccc71b7d Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 24 Feb 2007 01:45:18 +0000
Subject: [PATCH] fix ChangeLog.

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

diff --git a/ChangeLog b/ChangeLog
index c0cade390e..40a01792c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 Sat Feb 24 10:32:59 2007  Koichi Sasada  <ko1@atdot.net>
 
-	* common.mk: change vm_macro.def -> vm_macro.inc rule.
+	* common.mk: change vm_macro.def rule.
 
 Sat Feb 24 10:38:05 2007  Minero Aoki  <aamine@loveruby.net>
 
@@ -15,7 +15,6 @@ Sat Feb 24 07:31:35 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
 	* test/win32ole/test_win32ole_variant.rb: add some test for
 	  WIN32OLE_VARIANT.array, WIN32OLE_VARIANT#value=.
 
->>>>>>> .r11835
 Fri Feb 23 18:37:55 2007  Minero Aoki  <aamine@loveruby.net>
 
 	* test/ruby/test_yield.rb: new test.