From 36facb086edf1f96ac46eec6354912b7eccbd024 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Thu, 4 Dec 1997 01:14:08 +0000
Subject: [PATCH] Merge between my version and Jim Fulton's version; removed
 RCS keywords but otherwise unchanged.

---
 Include/cStringIO.h | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/Include/cStringIO.h b/Include/cStringIO.h
index fa8fffe8b56..6a2532dd0b4 100644
--- a/Include/cStringIO.h
+++ b/Include/cStringIO.h
@@ -2,7 +2,7 @@
 #define CSTRINGIO_INCLUDED
 /*
 
-  $Id$
+  cStringIO.h,v 1.3 1997/06/13 19:44:02 jim Exp
 
   cStringIO C API
 
@@ -69,13 +69,7 @@
 
   This would typically be done in your init function.
 
-  $Log$
-  Revision 2.6  1997/10/07 14:44:48  guido
-  Use K&R function prototypes.
-
-  Revision 2.5  1997/08/13 03:14:08  guido
-  cPickle release 0.3 from Jim Fulton
-
+  cStringIO.h,v
   Revision 1.3  1997/06/13 19:44:02  jim
   - changed to avoid warning of multiple declarations in 1.5 and
     our 1.4.