*** empty log message ***

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/v1_1r@415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
ruby · Apr 9, 1999 · b52b4a9 · b52b4a9
1 parent 178a2f7
commit b52b4a9
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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.