diff options
Diffstat (limited to 'index.html')
| -rw-r--r-- | index.html | 24 |
1 files changed, 0 insertions, 24 deletions
@@ -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> |