correcting merge
This commit is contained in:
@@ -3,11 +3,8 @@
|
|||||||
import youtube_dl
|
import youtube_dl
|
||||||
import json
|
import json
|
||||||
import ffmpeg
|
import ffmpeg
|
||||||
<<<<<<< HEAD
|
|
||||||
import subprocess
|
import subprocess
|
||||||
import glob
|
import glob
|
||||||
=======
|
|
||||||
>>>>>>> master
|
|
||||||
|
|
||||||
#jsonFileName = "clips.json"
|
#jsonFileName = "clips.json"
|
||||||
jsonFileName = "***REMOVED***Kniebeuge.json"
|
jsonFileName = "***REMOVED***Kniebeuge.json"
|
||||||
|
|||||||
Reference in New Issue
Block a user