fix rebase conflicts

Author: fippo

index.bs

@@ -474,12 +474,7 @@ dictionary RTCEncodedAudioFrameMetadata {
         </p>
     </dd>
     <dt>
-<<<<<<< HEAD
-<<<<<<< HEAD
         <dfn dict-member>contributingSources</dfn> of type <span class=
-=======
-        <dfn>contributingSources</dfn> of type <span class=
->>>>>>> 2cb275c (move mimeType definitions after other members added in the meantime)
             "idlMemberType">sequence&lt;unsigned long&gt;</span>
     </dt>
     <dd>
@@ -500,14 +495,7 @@ dictionary RTCEncodedAudioFrameMetadata {
         </p>
     </dd>
     <dt>
-<<<<<<< HEAD
-        <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)
-=======
-        <dfn dict-member>mimeType</dfn> of type <span class="idlMemberType">DOMString</span>
->>>>>>> 2cb275c (move mimeType definitions after other members added in the meantime)
     </dt>
     <dd>
         <p>