From 99a00d3dd968af97feebb3f3a9c8d8fd6821bb36 Mon Sep 17 00:00:00 2001
From: Baichuan Su <baichuan@multicorewareinc.com>
Date: Thu, 7 Nov 2013 09:56:59 -0800
Subject: [PATCH] Fix merge conflicts

---
 modules/ocl/test/test_imgproc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ocl/test/test_imgproc.cpp b/modules/ocl/test/test_imgproc.cpp
index f6317ad81..961e26227 100644
--- a/modules/ocl/test/test_imgproc.cpp
+++ b/modules/ocl/test/test_imgproc.cpp
@@ -289,7 +289,7 @@ OCL_TEST_P(CornerHarris, Mat)
         cornerHarris(src_roi, dst_roi, blockSize, apertureSize, k, borderType);
         ocl::cornerHarris(gsrc_roi, gdst_roi, blockSize, apertureSize, k, borderType);
 
-        Near(1e-5, true);
+        Near(1e-5);
     }
 }