[w3c/webauthn] 371c87: fix conflicts fer real this time (i hope) from GitHub on 2017-05-01 (public-webauthn@w3.org from May 2017)

From: GitHub <noreply@github.com>
Date: Mon, 01 May 2017 12:20:36 -0700
To: public-webauthn@w3.org
Message-ID: <59078a848ef37_5ae63f902c6c7c34957f@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/jeffh-publicKeyCred-406
  Home:   https://github.com/w3c/webauthn
  Commit: 371c876c77c1dfbb35ae2b24953eb674e7ee7c6b
      https://github.com/w3c/webauthn/commit/371c876c77c1dfbb35ae2b24953eb674e7ee7c6b
  Author: JeffH <Jeff.Hodges@PayPal.com>
  Date:   2017-05-01 (Mon, 01 May 2017)

  Changed paths:
    M index.bs

  Log Message:
  -----------
  fix conflicts fer real this time (i hope)

Received on Monday, 1 May 2017 19:21:09 UTC