Resolving conflicts after rebasing from public

2014-04-10 12:28:37 -07:00
parent b59c517f98 ede6d4482b
commit e032b5f5d5
2 changed files with 2 additions and 6 deletions
--- a/modules/imgproc/src/smooth.cpp
+++ b/modules/imgproc/src/smooth.cpp
@@ -2404,7 +2404,6 @@ static bool ocl_bilateralFilter_8u(InputArray _src, OutputArray _dst, int d,
 }

 #endif
-
 static void
 bilateralFilter_8u( const Mat& src, Mat& dst, int d,
    double sigma_color, double sigma_space,