Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BAE3F955D for ; Thu, 16 May 2013 21:24:27 +0000 (UTC) Received: (qmail 8020 invoked by uid 500); 16 May 2013 21:24:27 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 7994 invoked by uid 500); 16 May 2013 21:24:27 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 7986 invoked by uid 99); 16 May 2013 21:24:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 21:24:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 May 2013 21:24:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B75932388962; Thu, 16 May 2013 21:24:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1483571 - /subversion/branches/1.8.x/STATUS Date: Thu, 16 May 2013 21:24:06 -0000 To: commits@subversion.apache.org From: stefan2@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130516212406.B75932388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan2 Date: Thu May 16 21:24:06 2013 New Revision: 1483571 URL: http://svn.apache.org/r1483571 Log: * STATUS: remove conflict marker accidentally committed in r1483565 Modified: subversion/branches/1.8.x/STATUS Modified: subversion/branches/1.8.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1483571&r1=1483570&r2=1483571&view=diff ============================================================================== --- subversion/branches/1.8.x/STATUS (original) +++ subversion/branches/1.8.x/STATUS Thu May 16 21:24:06 2013 @@ -141,7 +141,6 @@ Approved for 1.8.1 or when we release a Votes: +1: philip, rhuijben, stsp ->>>>>>> .r1483563 Veto-blocked changes: =====================