From c94cec74c3959ee5456905d844342132690ea488 Mon Sep 17 00:00:00 2001
From: pdp8 <pdp8@pdp8.info>
Date: Fri, 26 Aug 2022 02:04:34 +0200
Subject: webm reactivated

---
 videos.html | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'videos.html')

diff --git a/videos.html b/videos.html
index 9cd696a..c6d9e23 100644
--- a/videos.html
+++ b/videos.html
@@ -16,14 +16,22 @@
   </nav>
   <div class='post' id='2021-03-17'>
     <h1>ticinetto</h1>Synthstrom Online Festival #4 <a href="https://synthstrom.com/TV/">https://synthstrom.com/TV/</a>
+<<<<<<< HEAD
     <p><video controls="" poster='/videos/2021-03-17_ticinetto/poster.png'><source src='/videos/2021-03-17_ticinetto/ticinetto.mp4' type='video/mpeg'> <a href='/videos/2021-03-17_ticinetto/ticinetto.mp4'>/videos/2021-03-17_ticinetto/ticinetto.mp4</a></video></p>
+=======
+    <p><video controls="" poster='/videos/2021-03-17_ticinetto/poster.png'><source src='/videos/2021-03-17_ticinetto/ticinetto.webm' type='video/webm'> <source src='/videos/2021-03-17_ticinetto/ticinetto.mp4' type='video/mp4'></video></p>
+>>>>>>> ee9ce0b (webm reactivated)
     <p><br>
     Youtube: <a href="https://youtu.be/cQlZSjpxEXs">https://youtu.be/cQlZSjpxEXs</a></p>
   </div>
   <hr>
   <div class='post' id='2019-08-01'>
     <h1>samplemaker</h1>Sound: dnice, Visuals: pdp8
+<<<<<<< HEAD
     <p><video controls="" poster='/videos/2019-08-01_samplemaker/poster.png'><source src='/videos/2019-08-01_samplemaker/samplemaker.mp4' type='video/mpeg'> <a href='/videos/2019-08-01_samplemaker/samplemaker.mp4'>/videos/2019-08-01_samplemaker/samplemaker.mp4</a></video></p>
+=======
+    <p><video controls="" poster='/videos/2019-08-01_samplemaker/poster.png'><source src='/videos/2019-08-01_samplemaker/samplemaker.webm' type='video/webm'> <source src='/videos/2019-08-01_samplemaker/samplemaker.mp4' type='video/mp4'></video></p>
+>>>>>>> ee9ce0b (webm reactivated)
     <p><br>
     YouTube: <a href="https://youtu.be/mB0a4UdM2KY">https://youtu.be/mB0a4UdM2KY</a><br>
     Source code: <a href="https://git.pdp8.info/samplemaker/">https://git.pdp8.info/samplemaker/</a></p>
@@ -31,13 +39,21 @@
   <hr>
   <div class='post' id='2019-03-04'>
     <h1>kriechstrom</h1>
+<<<<<<< HEAD
     <p><video controls="" poster='/videos/2019-03-04_kriechstrom/poster.png'><source src='/videos/2019-03-04_kriechstrom/kriechstrom.mp4' type='video/mpeg'> <a href='/videos/2019-03-04_kriechstrom/kriechstrom.mp4'>/videos/2019-03-04_kriechstrom/kriechstrom.mp4</a></video></p>
+=======
+    <p><video controls="" poster='/videos/2019-03-04_kriechstrom/poster.png'><source src='/videos/2019-03-04_kriechstrom/kriechstrom.webm' type='video/webm'> <source src='/videos/2019-03-04_kriechstrom/kriechstrom.mp4' type='video/mp4'></video></p>
+>>>>>>> ee9ce0b (webm reactivated)
     <p>Source code: <a href="https://git.pdp8.info/kriechstrom">https://git.pdp8.info/kriechstrom</a></p>
   </div>
   <hr>
   <div class='post' id='2018-03-28'>
     <h1>loveparade truck 2</h1>
+<<<<<<< HEAD
     <p><video controls="" poster='/videos/2018-03-28_loveparade_truck_2/poster.png'><source src='/videos/2018-03-28_loveparade_truck_2/loveparade_truck_2.mp4' type='video/mpeg'> <a href='/videos/2018-03-28_loveparade_truck_2/loveparade_truck_2.mp4'>/videos/2018-03-28_loveparade_truck_2/loveparade_truck_2.mp4</a></video></p>
+=======
+    <p><video controls="" poster='/videos/2018-03-28_loveparade_truck_2/poster.png'><source src='/videos/2018-03-28_loveparade_truck_2/loveparade_truck_2.webm' type='video/webm'> <source src='/videos/2018-03-28_loveparade_truck_2/loveparade_truck_2.mp4' type='video/mp4'></video></p>
+>>>>>>> ee9ce0b (webm reactivated)
     <p>YouTube: <a href="https://www.youtube.com/watch?v=801Dr3kHdek">https://www.youtube.com/watch?v=801Dr3kHdek</a></p>
   </div>
   <hr>
-- 
cgit v1.2.3