aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-06 08:20:04 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-06 08:20:04 +0000
commit6b6ddb6cdf64e246c5e06300ae705666feee596c (patch)
tree5f4366b51836ae0dfc9e69cb5ebdbc0a05dd8a32
parent088fb2a36ecc4e264e5952bf8157ee30c935fd0a (diff)
downloadruby-6b6ddb6cdf64e246c5e06300ae705666feee596c.tar.gz
ChangeLog fix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9648 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 999965ad5e..1c13948f43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,7 +27,6 @@ Wed Nov 30 23:52:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (NEWHEAP, ADD2HEAP): set count after pointer was set.
fixed: [ruby-dev:27896]
->>>>>>> 1.4819
Wed Nov 30 13:43:07 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* misc/ruby-mode.el (ruby-expr-beg): support $! at the end of