Fix merge conflicts

99a00d3d · Baichuan Su · befcbf56 · 99a00d3d
Commit 99a00d3d authored Nov 07, 2013 by Baichuan Su
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

test_imgproc.cpp modules/ocl/test/test_imgproc.cpp +1 -1

No files found.
--- 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);
    }
 }