[webauthn] new commits pushed by nicksteele

The following commits were just pushed by nicksteele to https://github.com/w3c/webauthn:

* Re-add merge conflct text
  by Nick Steele
https://github.com/w3c/webauthn/commit/b6fde375672d06e5980ca7d51dbfe9092ad3456c



-- 
Sent via github-notify-ml as configured in https://github.com/w3c/github-notify-ml-config

Received on Wednesday, 8 January 2025 20:31:13 UTC