[w3c/webauthn] a6c502: manually resolved merge conflicts from GitHub on 2017-10-04 (public-webauthn@w3.org from October 2017)

From: GitHub <noreply@github.com>
Date: Wed, 04 Oct 2017 10:31:58 -0700
To: public-webauthn@w3.org
Message-ID: <59d51b0ee445a_72d03f8a7c881c38671b@hookshot-fe6-cp1-prd.iad.github.net.mail>

  Branch: refs/heads/sign-counter-alg-507-alternative
  Home:   https://github.com/w3c/webauthn
  Commit: a6c5027f720711a81ab8efe9006f5c8fff85df92
      https://github.com/w3c/webauthn/commit/a6c5027f720711a81ab8efe9006f5c8fff85df92
  Author: rlin1 <rolf@noknok.com>
  Date:   2017-10-04 (Wed, 04 Oct 2017)

  Changed paths:
    M index.bs

  Log Message:
  -----------
  manually resolved merge conflicts

Received on Wednesday, 4 October 2017 17:32:41 UTC