From 997d9efd756bb10a200709af7b64d150aa665cb2 Mon Sep 17 00:00:00 2001
From: Jeremy Hu <huxingyi@msn.com>
Date: Tue, 2 Oct 2018 13:18:35 +0800
Subject: [PATCH] Fix build

---
 dust3d.pro | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/dust3d.pro b/dust3d.pro
index 872ca460..60f56e1d 100644
--- a/dust3d.pro
+++ b/dust3d.pro
@@ -460,16 +460,6 @@ macx {
 	GMP_LIBDIR = /usr/local/opt/gmp/lib
 	MPFR_INCLUDEDIR = /usr/local/opt/mpfr/include
 	MPFR_LIBDIR = /usr/local/opt/mpfr/lib
-<<<<<<< HEAD
-
-	exists(/usr/local/opt/opencv) {
-		INCLUDEPATH += /usr/local/opt/opencv/include
-		LIBS += -L/usr/local/opt/opencv/lib -lopencv_core -lopencv_videoio -lopencv_imgproc
-
-		DEFINES += "USE_OPENCV=1"
-	}
-=======
->>>>>>> curveeditor
 }
 
 unix:!macx {