From 6b6ddb6cdf64e246c5e06300ae705666feee596c Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 6 Dec 2005 08:20:04 +0000
Subject: ChangeLog fix.

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

(limited to 'ChangeLog')

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
-- 
cgit v1.2.1