Subject: [quicwg/base-drafts] 95aaae: Remove merge conflict hangover

From: Mike Bishop <[email-masked]>
Date: Tue, 21 Nov 2017 10:43:53 -0800

Branch: refs/heads/master
  Home:   https://github.com/quicwg/base-drafts
  Commit: 95aaaeb68101ea30a47d6b91f9085cfecc290bcd
      https://github.com/quicwg/base-drafts/commit/95aaaeb68101ea30a47d6b91f9085cfecc290bcd
  Author: Lucas Pardue <[email-masked]>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

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

  Log Message:
  -----------
  Remove merge conflict hangover

Makes the editor copy read weird!

  Commit: 02c98018890eae739ad11f4ac517da92292cd2c2
      https://github.com/quicwg/base-drafts/commit/02c98018890eae739ad11f4ac517da92292cd2c2
  Author: Mike Bishop <[email-masked]>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

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

  Log Message:
  -----------
  Merge pull request #949 from LPardue/patch-5

Remove merge conflict hangover

Compare: https://github.com/quicwg/base-drafts/compare/91e6f6b948de...02c98018890e