Merge branch 'onlineTraining' of /media/marko/mmcblk0p1-mmc-USD00_0x62b76940/gitReops/cwsvJudo into onlineTraining

2021-03-07 18:46:24 +01:00
parent fad79e1f67 f5c3b857e6
commit 34451c9680
30 changed files with 834 additions and 19 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"
 jsonFileName = "***REMOVED***Kniebeuge.json"