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

---
 music.html | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'music.html')

diff --git a/music.html b/music.html
index d109c48..ab17d9f 100644
--- a/music.html
+++ b/music.html
@@ -81,6 +81,15 @@
         </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>
@@ -96,12 +105,15 @@
         <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>
@@ -122,6 +134,15 @@
         <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>
@@ -134,12 +155,15 @@
         <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>
-- 
cgit v1.2.3