correcting merge

2021-03-07 18:58:40 +01:00
parent 34451c9680
commit 182824309b
1 changed files with 0 additions and 3 deletions
--- a/onlineTraining/yt-clipper.py
+++ b/onlineTraining/yt-clipper.py
@@ -3,11 +3,8 @@
 import youtube_dl
 import json
 import ffmpeg
-<<<<<<< HEAD
 import subprocess
 import glob
-=======
->>>>>>> master

 #jsonFileName = "clips.json"
 jsonFileName = "***REMOVED***Kniebeuge.json"