From 182824309be0b6a36a55aa495615b5764e692853 Mon Sep 17 00:00:00 2001
From: marko <cwsvjudo@arcor.de>
Date: Sun, 7 Mar 2021 18:58:40 +0100
Subject: [PATCH] correcting merge

---
 onlineTraining/yt-clipper.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/onlineTraining/yt-clipper.py b/onlineTraining/yt-clipper.py
index a28b681..de556ab 100755
--- 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"