Subject: [quicwg/base-drafts] f9c4c0: Merge conflict resolution during rebase

From: Mike Bishop <[email-masked]>
Date: Sat, 11 Nov 2017 01:01:54 -0800

Branch: refs/heads/biuni-wat
  Home:   https://github.com/quicwg/base-drafts
  Commit: f9c4c0745dfb1654c1feb0c5e71c8f0a222878a6
      https://github.com/quicwg/base-drafts/commit/f9c4c0745dfb1654c1feb0c5e71c8f0a222878a6
  Author: Mike Bishop <[email-masked]>
  Date:   2017-11-11 (Sat, 11 Nov 2017)

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

  Log Message:
  -----------
  Merge conflict resolution during rebase