summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-04-09 18:04:31 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-04-09 18:04:31 +0000
commitb52b4a93fde83bf35029b54526257a78595e29ec (patch)
tree93b49db5a1b9ea4e7be864a8c44a7aea56791e64 /ChangeLog
parent178a2f7064af173ed2b223b9a1c70e77dd016e49 (diff)
*** empty log message ***
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 061d3e05d7..3cc4dd5b07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,7 +72,6 @@ Tue Feb 16 23:42:51 1999 Yasuhiro Fukuma <yasuf@big.or.jp>
* configure.in: FreeBSD objformat patch
->>>>>>> 1.1.1.2.2.163
Tue Feb 16 12:40:55 1999 Yukihiro Matsumoto <matz@netlab.co.jp>
* version 1.2.3 (stable) released.