Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:97725
Return-Path: <pthreads@pthreads.org>
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Delivered-To: mailing list internals@lists.php.net
Received: (qmail 2461 invoked from network); 12 Jan 2017 15:25:03 -0000
Received: from unknown (HELO lists.php.net) (127.0.0.1)
  by localhost with SMTP; 12 Jan 2017 15:25:03 -0000
Authentication-Results: pb1.pair.com header.from=pthreads@pthreads.org; sender-id=unknown
Authentication-Results: pb1.pair.com smtp.mail=pthreads@pthreads.org; spf=permerror; sender-id=unknown
Received-SPF: error (pb1.pair.com: domain pthreads.org from 74.125.82.46 cause and error)
X-PHP-List-Original-Sender: pthreads@pthreads.org
X-Host-Fingerprint: 74.125.82.46 mail-wm0-f46.google.com  
Received: from [74.125.82.46] ([74.125.82.46:37792] helo=mail-wm0-f46.google.com)
	by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP
	id 49/26-50165-ECF97785 for <internals@lists.php.net>; Thu, 12 Jan 2017 10:25:03 -0500
Received: by mail-wm0-f46.google.com with SMTP id c206so25370062wme.0
        for <internals@lists.php.net>; Thu, 12 Jan 2017 07:25:02 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=pthreads-org.20150623.gappssmtp.com; s=20150623;
        h=mime-version:from:date:message-id:subject:to;
        bh=1XOMKvT8iQvFl9CBBRPk5j+NdPQhsRg/OcaSSvLO6sw=;
        b=ucBC/1wV1lxgLy8Gmhx3oVTfBKBsbcgqHyeh9AoPh/1tv7TFjjiHsYR3EumYDp9BLu
         U4wD/2OF3C/KQfRFo8/4mlSTc+fpCq0eIl8YmeI7NNEUVa4whndKbwTAq1F9hJc1/QDP
         cqjuGrRHrHXjyxLXzw0ITsIs0TWnMv8Vvx0pJW44Buol0nPoVcl2sfibP7T3t9McUGpN
         OUf+9Ab7EzjDTouOjcX+3DsJ3dUxrNDOAoPLx0M6yinGyORGmnl9h7DGFRphnhJcCnfu
         YXEXQyQzZnognsaq2Uu43hK2VteC/gUgQPB8I25/FS3gG9/fS1ksEjRhZfFZq+JYKbgP
         u/0Q==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20161025;
        h=x-gm-message-state:mime-version:from:date:message-id:subject:to;
        bh=1XOMKvT8iQvFl9CBBRPk5j+NdPQhsRg/OcaSSvLO6sw=;
        b=ezHF8pvycq7UPk/nfIKvfPO76tfVcgNn601e+00JET6T/09eh1KK82/L2pke7lxhKP
         PdXMV8JbMupCyJ7p2Aup/a696kvjLOLjfVWH7wu6UzOOO57TPUZHVHk2pbKYL7he4XJ6
         o0uVpOH6SEqP+fsNVYnYHIZ30E51yS6FxMk42qE7sMOzuYmjCey7txTwKjOnE3biBiTV
         1ANSUZwMb60QZd/1tWQSxRjU0Fq1GIoxglldV1T5G7iM8Oe03ChXjQuWB+GiHwxOQr18
         9tMD2L1NMm1HThr+aA8QVhdxQzNMQ+QOpZ5uvVNq65hRlGM9nWAq3xC6V3IoNYiN/BGX
         pRkA==
X-Gm-Message-State: AIkVDXLaIa9x6lydZtbPfCy38jDqkkfTps8PKOxTXYEYFSJbTv9mDq7HdjWUJ2cnsViiVvKqufzUENLiV6HkWg==
X-Received: by 10.223.138.188 with SMTP id y57mr7429286wry.191.1484234698331;
 Thu, 12 Jan 2017 07:24:58 -0800 (PST)
MIME-Version: 1.0
Received: by 10.80.176.4 with HTTP; Thu, 12 Jan 2017 07:24:57 -0800 (PST)
X-Originating-IP: [109.157.248.215]
Date: Thu, 12 Jan 2017 15:24:57 +0000
Message-ID: <CAL=_i_k=Uu7MWMEfqmuM2OF+SyuWBcO+Qd_S_cxaXsD3Jn1Pqg@mail.gmail.com>
To: PHP internals <internals@lists.php.net>
Content-Type: multipart/alternative; boundary=001a1149818ef540e40545e75182
Subject: PHP 7.1 Bad Merge
From: pthreads@pthreads.org (Joe Watkins)

--001a1149818ef540e40545e75182
Content-Type: text/plain; charset=UTF-8

Afternoon internals,

I done a bad merge into 7.1, please do not commit until it is reset.

Very sorry for the inconvenience.

Cheers
Joe

--001a1149818ef540e40545e75182--