From 06aeddaf926a38c6ff436988b6ed373a00fb23df Mon Sep 17 00:00:00 2001
From: sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 Feb 2011 05:35:05 +0000
Subject: * lib/test/unit.rb: Fix merging miss.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index ea4b6da606..af2ecc88cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 22 14:34:26 2011  Shota Fukumori (sora_h) <sorah@tubusu.net>
+
+	* lib/test/unit.rb: Fix merging miss.
+
 Tue Feb 22 12:27:26 2011  Shota Fukumori (sora_h) <sorah@tubusu.net>
 
 	* lib/test/unit.rb: Add new options; --jobs,-j,--ruby,--jobs-status,
-- 
cgit v1.2.3