[w3c/webauthn] b6fde3: Re-add merge conflct text

• From: Nick Steele <noreply@github.com>
• Date: Wed, 08 Jan 2025 12:31:31 -0800
• To: public-webauthn@w3.org
• Message-ID: <w3c/webauthn/push/refs/heads/issue-1979-notes/6be550-b6fde3@github.com>

  Branch: refs/heads/issue-1979-notes
  Home:   https://github.com/w3c/webauthn
  Commit: b6fde375672d06e5980ca7d51dbfe9092ad3456c
      https://github.com/w3c/webauthn/commit/b6fde375672d06e5980ca7d51dbfe9092ad3456c
  Author: Nick Steele <344821+nicksteele@users.noreply.github.com>
  Date:   2025-01-08 (Wed, 08 Jan 2025)

  Changed paths:
    M index.bs

  Log Message:
  -----------
  Re-add merge conflct text



To unsubscribe from these emails, change your notification settings at https://github.com/w3c/webauthn/settings/notifications

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