From aa6f44e34fc4851ee017a557a53cec0d07bd2f77 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 13 Jun 2006 13:04:08 +0000
Subject: * ChangeLog: removed garbage.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c2b2b8035..b3fd9de15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,7 +40,6 @@ Sun Jun 11 04:38:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* object.c (sym_to_proc): imported Symbol#to_proc from ActiveSupport.
 
->>>>>>> 1.5068
 Sat Jun 10 18:02:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
-- 
cgit