[quicwg/base-drafts] 9b7fcc: Resolve merge conflict

Martin Thomson <noreply@github.com> Tue, 09 June 2020 22:17 UTC

Return-Path: <noreply@github.com>
X-Original-To: quic-issues@ietfa.amsl.com
Delivered-To: quic-issues@ietfa.amsl.com
Received: from localhost (localhost [127.0.0.1]) by ietfa.amsl.com (Postfix) with ESMTP id 512993A078A for <quic-issues@ietfa.amsl.com>; Tue, 9 Jun 2020 15:17:19 -0700 (PDT)
X-Virus-Scanned: amavisd-new at amsl.com
X-Spam-Flag: NO
X-Spam-Score: -2.101
X-Spam-Level:
X-Spam-Status: No, score=-2.101 tagged_above=-999 required=5 tests=[BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=ham autolearn_force=no
Authentication-Results: ietfa.amsl.com (amavisd-new); dkim=pass (1024-bit key) header.d=github.com
Received: from mail.ietf.org ([4.31.198.44]) by localhost (ietfa.amsl.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XNiyiUfxEIqN for <quic-issues@ietfa.amsl.com>; Tue, 9 Jun 2020 15:17:18 -0700 (PDT)
Received: from out-19.smtp.github.com (out-19.smtp.github.com [192.30.252.202]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ietfa.amsl.com (Postfix) with ESMTPS id 3C62A3A078C for <quic-issues@ietf.org>; Tue, 9 Jun 2020 15:17:18 -0700 (PDT)
Received: from github-lowworker-39b4a70.va3-iad.github.net (github-lowworker-39b4a70.va3-iad.github.net [10.48.16.66]) by smtp.github.com (Postfix) with ESMTP id 84EC752034F for <quic-issues@ietf.org>; Tue, 9 Jun 2020 15:17:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=github.com; s=pf2014; t=1591741037; bh=UFTM8cChR5D7UMdN3ExVj+HCol5im4WpgocO5zfY4cI=; h=Date:From:To:Subject:From; b=gSq/323fJdRxQTGy44E3czPDTDfkPojBCtPIjlMZszulTfW7zB9iLdLXF/sjUoZFK L3ulNxg132VJ3wqurYEuOaboBLXAuOMlfgCR3/mUqHplhp7CnzAvfealTEhbpgV11R cG3KREP6KUnj2wr31LNKzJDfeGSPUdwpNVdKfehI=
Date: Tue, 09 Jun 2020 15:17:17 -0700
From: Martin Thomson <noreply@github.com>
To: quic-issues@ietf.org
Message-ID: <quicwg/base-drafts/push/refs/heads/split-initial-size/df0f3a-9b7fcc@github.com>
Subject: [quicwg/base-drafts] 9b7fcc: Resolve merge conflict
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
X-GitHub-Recipient-Address: quic-issues@ietf.org
X-Auto-Response-Suppress: All
Archived-At: <https://mailarchive.ietf.org/arch/msg/quic-issues/aS-JcEX1g7xLLWhaGBMLyLB7Mao>
X-BeenThere: quic-issues@ietf.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Notification list for GitHub issues related to the QUIC WG <quic-issues.ietf.org>
List-Unsubscribe: <https://www.ietf.org/mailman/options/quic-issues>, <mailto:quic-issues-request@ietf.org?subject=unsubscribe>
List-Archive: <https://mailarchive.ietf.org/arch/browse/quic-issues/>
List-Post: <mailto:quic-issues@ietf.org>
List-Help: <mailto:quic-issues-request@ietf.org?subject=help>
List-Subscribe: <https://www.ietf.org/mailman/listinfo/quic-issues>, <mailto:quic-issues-request@ietf.org?subject=subscribe>
X-List-Received-Date: Tue, 09 Jun 2020 22:17:19 -0000

  Branch: refs/heads/split-initial-size
  Home:   https://github.com/quicwg/base-drafts
  Commit: 9b7fcc87006a057ff1a9fa1935985b79f1b06777
      https://github.com/quicwg/base-drafts/commit/9b7fcc87006a057ff1a9fa1935985b79f1b06777
  Author: Martin Thomson <mt@lowentropy.net>
  Date:   2020-06-10 (Wed, 10 Jun 2020)

  Changed paths:
    M draft-ietf-quic-transport.md

  Log Message:
  -----------
  Resolve merge conflict