move mimeType definitions after other members added in the meantime

Author: fippo

Diff for: index.bs

@@ -375,7 +375,7 @@ dictionary RTCEncodedVideoFrameMetadata {
 	    {{VideoFrame/timestamp}} for raw frames which correspond to this frame.
         </p>
     </dd>
-    <dd>
+    <dt>
         <dfn dict-member>mimeType</dfn> of type <span class="idlMemberType">DOMString</span>
     </dt>
     <dd>
@@ -474,8 +474,12 @@ 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>
@@ -496,10 +500,14 @@ 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>