Merge branch 'master' into onlineTraining

2021-03-07 12:31:13 +01:00
parent ececf0487a 01a974d8ea
commit 7293544e6a
26 changed files with 778 additions and 4 deletions
--- a/onlineTraining/yt-clipper.py
+++ b/onlineTraining/yt-clipper.py
@@ -3,8 +3,11 @@
 import youtube_dl
 import json
 import ffmpeg
+<<<<<<< HEAD
 import subprocess
 import glob
+=======
+>>>>>>> master

 jsonFileName = "clips.json"