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

From: Martin Thomson <[email-masked]>
Date: Tue, 09 Jun 2020 15:17:17 -0700

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 <[email-masked]>
  Date:   2020-06-10 (Wed, 10 Jun 2020)

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

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