From 8345a592d03350b6e9efd54b269a64791621410e Mon Sep 17 00:00:00 2001 From: pdp8 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 @@ -<<<<<<< HEAD -======= 08-spotify ->>>>>>> ee9ce0b (webm reactivated) 09-tiktok @@ -105,15 +102,6 @@ 11-youtube -<<<<<<< HEAD - - - - 08-spotify - - -======= ->>>>>>> ee9ce0b (webm reactivated) @@ -134,15 +122,12 @@ 02-innenhydrantensystem -<<<<<<< HEAD -======= 03-vollkegelspruehduesen ->>>>>>> ee9ce0b (webm reactivated) @@ -155,15 +140,6 @@ 05-schaummonitor -<<<<<<< HEAD - - - - 03-vollkegelspruehduesen - - -======= ->>>>>>> ee9ce0b (webm reactivated) diff --git a/music.html b/music.html index ab17d9f..79b9147 100644 --- a/music.html +++ b/music.html @@ -81,15 +81,12 @@ -<<<<<<< HEAD -======= 08-spotify ->>>>>>> ee9ce0b (webm reactivated) 09-tiktok @@ -105,15 +102,6 @@ 11-youtube -<<<<<<< HEAD - - - - 08-spotify - - -======= ->>>>>>> ee9ce0b (webm reactivated) @@ -134,15 +122,12 @@ 02-innenhydrantensystem -<<<<<<< HEAD -======= 03-vollkegelspruehduesen ->>>>>>> ee9ce0b (webm reactivated) @@ -155,15 +140,6 @@ 05-schaummonitor -<<<<<<< HEAD - - - - 03-vollkegelspruehduesen - - -======= ->>>>>>> ee9ce0b (webm reactivated) diff --git a/videos.html b/videos.html index c6d9e23..48931ef 100644 --- a/videos.html +++ b/videos.html @@ -16,22 +16,14 @@

ticinetto

Synthstrom Online Festival #4 https://synthstrom.com/TV/ -<<<<<<< HEAD -

-=======

->>>>>>> ee9ce0b (webm reactivated)


Youtube: https://youtu.be/cQlZSjpxEXs


samplemaker

Sound: dnice, Visuals: pdp8 -<<<<<<< HEAD -

-=======

->>>>>>> ee9ce0b (webm reactivated)


YouTube: https://youtu.be/mB0a4UdM2KY
Source code: https://git.pdp8.info/samplemaker/

@@ -39,21 +31,13 @@

kriechstrom

-<<<<<<< HEAD -

-=======

->>>>>>> ee9ce0b (webm reactivated)

Source code: https://git.pdp8.info/kriechstrom


loveparade truck 2

-<<<<<<< HEAD -

-=======

->>>>>>> ee9ce0b (webm reactivated)

YouTube: https://www.youtube.com/watch?v=801Dr3kHdek


-- cgit v1.2.3