Subject: [quicwg/base-drafts] 5a9348: Missed a merge conflict instance

From: Mike Bishop <[email-masked]>
Date: Wed, 08 Mar 2017 15:59:37 -0800

Branch: refs/heads/http_extensions
  Home:   https://github.com/quicwg/base-drafts
  Commit: 5a93487f7d807e704af9d6e44789804930d04675
      https://github.com/quicwg/base-drafts/commit/5a93487f7d807e704af9d6e44789804930d04675
  Author: Mike Bishop <[email-masked]>
  Date:   2017-03-08 (Wed, 08 Mar 2017)

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

  Log Message:
  -----------
  Missed a merge conflict instance