[w3c/webauthn] ef0fe0: resolved 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:38:13 -0700
To: public-webauthn@w3.org
Message-ID: <59d51c85276a9_1f263fb77af1fc2c88913@hookshot-fe3-cp1-prd.iad.github.net.mail>

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

  Changed paths:
    M index.bs

  Log Message:
  -----------
  resolved conflicts

Received on Wednesday, 4 October 2017 17:38:43 UTC