fix ChangeLog.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
fgo · Feb 24, 2007 · e3155f4 · e3155f4
1 parent 287aa33
commit e3155f4
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,6 @@
 Sat Feb 24 10:32:59 2007  Koichi Sasada  <[email protected]>
 
-	* 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  <[email protected]>
 
@@ -15,7 +15,6 @@ Sat Feb 24 07:31:35 2007  Masaki Suketa  <[email protected]>
 	* 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  <[email protected]>
 
 	* test/ruby/test_yield.rb: new test.