From 42f3ae0286dde31fa217a95f11d3264ef4fba60f Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Jul 2003 10:44:27 +0000
Subject: [PATCH] garbage

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

diff --git a/ChangeLog b/ChangeLog
index d5c40f4b73..c70cdbea77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,7 +79,6 @@ Mon Jul 28 18:53:03 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 	* ext/openssl/extconf.rb: check again after pkg-config for MinGW on
 	  Cygwin.
 
->>>>>>> 1.1963
 Mon Jul 28 15:32:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/stringio/stringio.c (strio_gets): only "gets" should set $_.