dfn fixes

Co-authored-by: Dominique Hazael-Massieux <[email protected]>

Author: fippo

index.bs

@@ -474,6 +474,7 @@ dictionary RTCEncodedAudioFrameMetadata {
         </p>
     </dd>
     <dt>
+<<<<<<< HEAD
         <dfn dict-member>contributingSources</dfn> of type <span class=
             "idlMemberType">sequence&lt;unsigned long&gt;</span>
     </dt>
@@ -496,6 +497,9 @@ dictionary RTCEncodedAudioFrameMetadata {
     </dd>
     <dt>
         <dfn>mimeType</dfn> of type <span class="idlMemberType">DOMString</span>
+=======
+        <dfn dict-member>mimeType</dfn> of type <span class="idlMemberType">DOMString</span>
+>>>>>>> 1bb68bc (dfn fixes)
     </dt>
     <dd>
         <p>