From 765921cc25bdb37a81ca86b8224532dd46fde8c5 Mon Sep 17 00:00:00 2001
From: lluis <lgomez@cvc.uab.es>
Date: Wed, 4 Sep 2013 20:20:25 +0200
Subject: [PATCH] fixed a typo error in the default min_Probability param of
 CreateERFilterNM2

---
 modules/objdetect/include/opencv2/objdetect/erfilter.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/objdetect/include/opencv2/objdetect/erfilter.hpp b/modules/objdetect/include/opencv2/objdetect/erfilter.hpp
index 8a1b580..2e05996 100644
--- a/modules/objdetect/include/opencv2/objdetect/erfilter.hpp
+++ b/modules/objdetect/include/opencv2/objdetect/erfilter.hpp
@@ -190,8 +190,13 @@ 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_
-- 
2.7.4