From 90f1f7b0ace8907f82049b44ab586b580b44efe2 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 2 Nov 2006 06:46:51 +0000
Subject: * ChangeLog: typo.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b8ea7ca58..041c7ec3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 Thu Nov  2 15:43:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* parse.y (primary): should set NODE when compstmt is NULL.
-	  marge from trunk. fixed: [ruby-dev:29732]
+	* parse.y (primary): should set NODE even when compstmt is NULL.
+	  merge from trunk. fixed: [ruby-dev:29732]
 
 Thu Nov  2 14:48:30 2006  Akinori MUSHA  <knu@iDaemons.org>
 
-- 
cgit