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

From: Jana Iyengar <[email-masked]>
Date: Tue, 09 Jun 2020 15:28:47 -0700

Branch: refs/heads/master
  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

  Commit: 96bbbc59a81d8aff29896b6dbddb2b27b30c3709
      https://github.com/quicwg/base-drafts/commit/96bbbc59a81d8aff29896b6dbddb2b27b30c3709
  Author: Jana Iyengar <[email-masked]>
  Date:   2020-06-09 (Tue, 09 Jun 2020)

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

  Log Message:
  -----------
  Merge pull request #3746 from quicwg/split-initial-size

A section devoted to Initial packet size

Compare: https://github.com/quicwg/base-drafts/compare/4f0be56923a2...96bbbc59a81d