From 062b341e683f0db69dbf2ae5066ada551de201f9 Mon Sep 17 00:00:00 2001
From: Ella Pietraroia <ella@ausocean.org>
Date: Tue, 31 Dec 2019 15:39:09 +1030
Subject: [PATCH] fixing merge problems

---
 filter/knn.go | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/filter/knn.go b/filter/knn.go
index 74abe098..cc65d1de 100644
--- a/filter/knn.go
+++ b/filter/knn.go
@@ -1,9 +1,6 @@
 /*
-<<<<<<< HEAD
 // +build !circleci
 
-=======
->>>>>>> 65f1c89ff2220eb828dcec312da11dbc620449bc
 DESCRIPTION
   A filter that detects motion and discards frames without motion. The
   filter uses a K-Nearest Neighbours (KNN) to determine what is
@@ -32,10 +29,7 @@ LICENSE
 package filter
 
 import (
-<<<<<<< HEAD
 	"fmt"
-=======
->>>>>>> 65f1c89ff2220eb828dcec312da11dbc620449bc
 	"image"
 	"image/color"
 	"io"
@@ -81,14 +75,10 @@ func (m *KNNFilter) Close() error {
 // Write applies the motion filter to the video stream. Only frames with motion
 // are written to the destination encoder, frames without are discarded.
 func (m *KNNFilter) Write(f []byte) (int, error) {
-<<<<<<< HEAD
 	img, err := gocv.IMDecode(f, gocv.IMReadColor)
 	if err != nil {
 		return 0, fmt.Errorf("can't decode image: %w", err)
 	}
-=======
-	img, _ := gocv.IMDecode(f, gocv.IMReadColor)
->>>>>>> 65f1c89ff2220eb828dcec312da11dbc620449bc
 	defer img.Close()
 
 	imgDelta := gocv.NewMat()