From 8345a592d03350b6e9efd54b269a64791621410e Mon Sep 17 00:00:00 2001
From: pdp8 <pdp8@pdp8.info>
Date: Fri, 26 Aug 2022 02:09:44 +0200
Subject: webm reactivated

---
 index.html  | 24 ------------------------
 music.html  | 24 ------------------------
 videos.html | 16 ----------------
 3 files changed, 64 deletions(-)

diff --git a/index.html b/index.html
index ab17d9f..79b9147 100644
--- a/index.html
+++ b/index.html
@@ -81,15 +81,12 @@
         </td>
       </tr>
       <tr>
-<<<<<<< HEAD
-=======
         <td>08-spotify</td>
         <td>
           <audio controls=""><source src='/music/2021-09-25_calling_home/08-spotify.mp3' type='audio/mpeg'></audio>
         </td>
       </tr>
       <tr>
->>>>>>> ee9ce0b (webm reactivated)
         <td>09-tiktok</td>
         <td>
           <audio controls=""><source src='/music/2021-09-25_calling_home/09-tiktok.mp3' type='audio/mpeg'></audio>
@@ -105,15 +102,6 @@
         <td>11-youtube</td>
         <td>
           <audio controls=""><source src='/music/2021-09-25_calling_home/11-youtube.mp3' type='audio/mpeg'></audio>
-<<<<<<< HEAD
-        </td>
-      </tr>
-      <tr>
-        <td>08-spotify</td>
-        <td>
-          <audio controls=""><source src='/music/2021-09-25_calling_home/08-spotify.mp3' type='audio/mpeg'></audio>
-=======
->>>>>>> ee9ce0b (webm reactivated)
         </td>
       </tr>
     </table>
@@ -134,15 +122,12 @@
         <td>02-innenhydrantensystem</td>
         <td>
           <audio controls=""><source src='/music/2020-04-17_ringleitung_schaum/02-innenhydrantensystem.mp3' type='audio/mpeg'></audio>
-<<<<<<< HEAD
-=======
         </td>
       </tr>
       <tr>
         <td>03-vollkegelspruehduesen</td>
         <td>
           <audio controls=""><source src='/music/2020-04-17_ringleitung_schaum/03-vollkegelspruehduesen.mp3' type='audio/mpeg'></audio>
->>>>>>> ee9ce0b (webm reactivated)
         </td>
       </tr>
       <tr>
@@ -155,15 +140,6 @@
         <td>05-schaummonitor</td>
         <td>
           <audio controls=""><source src='/music/2020-04-17_ringleitung_schaum/05-schaummonitor.mp3' type='audio/mpeg'></audio>
-<<<<<<< HEAD
-        </td>
-      </tr>
-      <tr>
-        <td>03-vollkegelspruehduesen</td>
-        <td>
-          <audio controls=""><source src='/music/2020-04-17_ringleitung_schaum/03-vollkegelspruehduesen.mp3' type='audio/mpeg'></audio>
-=======
->>>>>>> ee9ce0b (webm reactivated)
         </td>
       </tr>
     </table>
diff --git a/music.html b/music.html
index ab17d9f..79b9147 100644
--- a/music.html
+++ b/music.html
@@ -81,15 +81,12 @@
         </td>
       </tr>
       <tr>
-<<<<<<< HEAD
-=======
         <td>08-spotify</td>
         <td>
           <audio controls=""><source src='/music/2021-09-25_calling_home/08-spotify.mp3' type='audio/mpeg'></audio>
         </td>
       </tr>
       <tr>
->>>>>>> ee9ce0b (webm reactivated)
         <td>09-tiktok</td>
         <td>
           <audio controls=""><source src='/music/2021-09-25_calling_home/09-tiktok.mp3' type='audio/mpeg'></audio>
@@ -105,15 +102,6 @@
         <td>11-youtube</td>
         <td>
           <audio controls=""><source src='/music/2021-09-25_calling_home/11-youtube.mp3' type='audio/mpeg'></audio>
-<<<<<<< HEAD
-        </td>
-      </tr>
-      <tr>
-        <td>08-spotify</td>
-        <td>
-          <audio controls=""><source src='/music/2021-09-25_calling_home/08-spotify.mp3' type='audio/mpeg'></audio>
-=======
->>>>>>> ee9ce0b (webm reactivated)
         </td>
       </tr>
     </table>
@@ -134,15 +122,12 @@
         <td>02-innenhydrantensystem</td>
         <td>
           <audio controls=""><source src='/music/2020-04-17_ringleitung_schaum/02-innenhydrantensystem.mp3' type='audio/mpeg'></audio>
-<<<<<<< HEAD
-=======
         </td>
       </tr>
       <tr>
         <td>03-vollkegelspruehduesen</td>
         <td>
           <audio controls=""><source src='/music/2020-04-17_ringleitung_schaum/03-vollkegelspruehduesen.mp3' type='audio/mpeg'></audio>
->>>>>>> ee9ce0b (webm reactivated)
         </td>
       </tr>
       <tr>
@@ -155,15 +140,6 @@
         <td>05-schaummonitor</td>
         <td>
           <audio controls=""><source src='/music/2020-04-17_ringleitung_schaum/05-schaummonitor.mp3' type='audio/mpeg'></audio>
-<<<<<<< HEAD
-        </td>
-      </tr>
-      <tr>
-        <td>03-vollkegelspruehduesen</td>
-        <td>
-          <audio controls=""><source src='/music/2020-04-17_ringleitung_schaum/03-vollkegelspruehduesen.mp3' type='audio/mpeg'></audio>
-=======
->>>>>>> ee9ce0b (webm reactivated)
         </td>
       </tr>
     </table>
diff --git a/videos.html b/videos.html
index c6d9e23..48931ef 100644
--- a/videos.html
+++ b/videos.html
@@ -16,22 +16,14 @@
   </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>
@@ -39,21 +31,13 @@
   <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