Update bitstream-formats.xml

Remove diff code from bistreams-formats.xml
VTUL · Sep 15, 2020 · 998947f · 998947f
1 parent e8ab764
commit 998947f
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/dspace/config/registries/bitstream-formats.xml b/dspace/config/registries/bitstream-formats.xml
@@ -742,13 +742,7 @@
       <extension>epub</extension>
     </bitstream-type>
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     <bitstream-type>
->>>>>>> Enable text indexing of WebVTT caption files
-=======
-    <bitstream-type>
->>>>>>> f786574afa0187a6964ff90f2cd72b4a7a34ce88
       <mimetype>video/mp4</mimetype>
       <short_description>MP4 Container</short_description>
       <description>MP4 Container format for video files</description>
@@ -757,13 +751,7 @@
       <extension>m4v</extension>
       <extension>mp4</extension>
     </bitstream-type>
-<<<<<<< HEAD
-<<<<<<< HEAD
 
->>>>>>> Enable text indexing of WebVTT caption files
-=======
-
->>>>>>> f786574afa0187a6964ff90f2cd72b4a7a34ce88
     <bitstream-type>
       <mimetype>video/webm</mimetype>
       <short_description>webm video</short_description>
@@ -772,13 +760,7 @@
       <internal>false</internal>
       <extension>webm</extension>
     </bitstream-type>
-<<<<<<< HEAD
-<<<<<<< HEAD
 
->>>>>>> Enable text indexing of WebVTT caption files
-=======
-
->>>>>>> f786574afa0187a6964ff90f2cd72b4a7a34ce88
     <bitstream-type>
       <mimetype>text/vtt</mimetype>
       <short_description>WebVTT caption file</short_description>