summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-13 13:04:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-13 13:04:08 +0000
commitaa6f44e34fc4851ee017a557a53cec0d07bd2f77 (patch)
tree9a39f9c08ab5d4cd1efb1e6c9b14dbd670143f86
parent47e22f6dac0c17094d1901ba40626b6787475968 (diff)
downloadruby-aa6f44e34fc4851ee017a557a53cec0d07bd2f77.tar.gz
ruby-aa6f44e34fc4851ee017a557a53cec0d07bd2f77.tar.xz
ruby-aa6f44e34fc4851ee017a557a53cec0d07bd2f77.zip
* ChangeLog: removed garbage.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
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