Subject: [quicwg/base-drafts] 3b38b0: Fix bad merge

From: Mike Bishop <[email-masked]>
Date: Mon, 30 Jan 2017 07:41:04 -0800

Branch: refs/heads/unidirectional
  Home:   https://github.com/quicwg/base-drafts
  Commit: 3b38b0f53d8291e8cc9b9830193ee01c4b203ba2
      https://github.com/quicwg/base-drafts/commit/3b38b0f53d8291e8cc9b9830193ee01c4b203ba2
  Author: Mike Bishop <[email-masked]>
  Date:   2017-01-30 (Mon, 30 Jan 2017)

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

  Log Message:
  -----------
  Fix bad merge