fixed rebase conflicts

modules/objdetect/include/opencv2/objdetect/erfilter.hpp

@@ -190,13 +190,8 @@ CV_EXPORTS Ptr<ERFilter> createERFilterNM1(const Ptr<ERFilter::Callback>& cb = P
                            if omitted tries to load a default classifier from file trained_classifierNM2.xml
     \param  minProbability The minimum probability P(er|character) allowed for retreived ER's
 */
-<<<<<<< HEAD
 CV_EXPORTS Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb = Ptr<ERFilter::Callback>(),
-                                                  float minProbability = 0.85);
-=======
-CV_EXPORTS Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb = NULL,
                                                   float minProbability = 0.5);
->>>>>>> fixed a typo error in the default min_Probability param of CreateERFilterNM2
 
 }
 #endif // _OPENCV_ERFILTER_HPP_

modules/objdetect/src/erfilter.cpp

@@ -783,16 +783,7 @@ ERStat* ERFilterNM::er_tree_filter ( InputArray image, ERStat * stat, ERStat *pa
     findContours( region, contours, hierarchy, RETR_TREE, CHAIN_APPROX_NONE, Point(0, 0) );
     //TODO check epsilon parameter of approxPolyDP (set empirically) : we want more precission
     //     if the region is very small because otherwise we'll loose all the convexities
-<<<<<<< HEAD
-<<<<<<< HEAD
-    approxPolyDP( Mat(contours[0]), contour_poly, min(rect.width,rect.height)/17, true );
-=======
     approxPolyDP( Mat(contours[0]), contour_poly, (float)min(rect.width,rect.height)/17, true );
->>>>>>> fixed a bug in the calculation of the number of inflexion points feature
-=======
-    approxPolyDP( Mat(contours[0]), contour_poly, (float)min(rect.width,rect.height)/17, true );
->>>>>>> removed trailing whitespaces
-
 
     bool was_convex = false;
     int  num_inflexion_points = 0;
@@ -1106,16 +1097,8 @@ Ptr<ERFilter> createERFilterNM1(const Ptr<ERFilter::Callback>& cb, int threshold
     CV_Assert( (thresholdDelta >= 0) && (thresholdDelta <= 128) );
     CV_Assert( (minProbabilityDiff >= 0.) && (minProbabilityDiff <= 1.) );
 
-<<<<<<< HEAD
     Ptr<ERFilterNM> filter = makePtr<ERFilterNM>();
 
-=======
-    Ptr<ERFilterNM> filter = new ERFilterNM();
-
-<<<<<<< HEAD
->>>>>>> fixed a bug in the non-max-suppression filter procedure
-=======
->>>>>>> removed trailing whitespaces
     if (cb == NULL)
         filter->setCallback(makePtr<ERClassifierNM1>());
     else
@@ -1150,11 +1133,6 @@ Ptr<ERFilter> createERFilterNM2(const Ptr<ERFilter::Callback>& cb, float minProb
 
     Ptr<ERFilterNM> filter = makePtr<ERFilterNM>();
 
-
-<<<<<<< HEAD
-=======
-
->>>>>>> removed trailing whitespaces
     if (cb == NULL)
         filter->setCallback(makePtr<ERClassifierNM2>());
     else