fix error in resolving rebase conflicts

w3c · Aug 18, 2017 · 28f52af · 28f52af
1 parent a1be0f6
commit 28f52af
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/index.bs b/index.bs
@@ -687,8 +687,13 @@ When this method is invoked, the user agent MUST execute the following algorithm
         1. Otherwise, [=list/Append=] |C| to |excludeCredentialDescriptorList|.
 
         1. [=In parallel=], invoke the [=authenticatorMakeCredential=] operation on |authenticator| with
-        |clientDataHash|, <code>|options|.{{MakePublicKeyCredentialOptions/rp}}</code>, <code>|options|.{{MakePublicKeyCredentialOptions/user}}</code>,
-        |normalizedParameters|, |excludeCredentialDescriptorList|, and |authenticatorExtensions| as parameters.
+            |clientDataHash|, 
+            |options|.{{MakePublicKeyCredentialOptions/rp}}, 
+            |options|.{{MakePublicKeyCredentialOptions/user}},
+            <code>|options|.{{MakePublicKeyCredentialOptions/authenticatorSelection}}.{{AuthenticatorSelectionCriteria/rk}}</code>,
+            |credTypesAndPubKeyAlgs|, 
+            |excludeCredentialDescriptorList|, 
+            and |authenticatorExtensions| as parameters.
 
     1. [=set/Append=] |authenticator| to |issuedRequests|.