From 2787110e1437e8369ca37f1ac95c4043a9d631b5 Mon Sep 17 00:00:00 2001 From: "saxon.milton@gmail.com" Date: Wed, 14 Mar 2018 08:33:38 +1030 Subject: [PATCH] fixed conflict --- revid/RevidInstance.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/revid/RevidInstance.go b/revid/RevidInstance.go index d13d1f4e..d94cc73b 100644 --- a/revid/RevidInstance.go +++ b/revid/RevidInstance.go @@ -315,11 +315,7 @@ func (r *revidInst) outputClips() { for r.isRunning { // Here we slow things down as much as we can to decrease cpu usage switch { -<<<<<<< HEAD - case r.ringBuffer.GetNoOfElements() < 200: -======= case r.ringBuffer.GetNoOfElements() < 2: ->>>>>>> 2eae228d739eec6c71ac204250b980cc1c158a91 delay++ time.Sleep(time.Duration(delay) * time.Millisecond) case delay > 0: