Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 93740 invoked by uid 500); 12 Sep 2000 23:16:46 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 93729 invoked by uid 500); 12 Sep 2000 23:16:46 -0000 Delivered-To: apmail-apache-2.0-cvs@apache.org Date: 12 Sep 2000 23:16:46 -0000 Message-ID: <20000912231646.93724.qmail@locus.apache.org> From: trawick@locus.apache.org To: apache-2.0-cvs@apache.org Subject: cvs commit: apache-2.0/src CHANGES trawick 00/09/12 16:16:45 Modified: src CHANGES Log: Remove conflict indicators inadvertently committed a minute ago. Revision Changes Path 1.225 +0 -1 apache-2.0/src/CHANGES Index: CHANGES =================================================================== RCS file: /home/cvs/apache-2.0/src/CHANGES,v retrieving revision 1.224 retrieving revision 1.225 diff -u -r1.224 -r1.225 --- CHANGES 2000/09/12 23:15:35 1.224 +++ CHANGES 2000/09/12 23:16:45 1.225 @@ -20,7 +20,6 @@ EOS, by utilizing a flag in the request_rec. [Ryan Bloom] ->>>>>>> 1.223 *) apr_put_os_file() now sets up the unget byte appropriately on Unix and Win32. Previously, the first read from an apr_file_t set up via apr_put_os_file() would return a '\0'. [Jeff Trawick]