fixed conflicts

modules/calib3d/src/solvepnp.cpp

@@ -114,6 +114,7 @@ bool cv::solvePnP( InputArray _opoints, InputArray _ipoints,
 
 class PnPRansacCallback : public PointSetRegistrator::Callback
 {
+
 public:
 
     PnPRansacCallback(Mat _cameraMatrix=Mat(3,3,CV_64F), Mat _distCoeffs=Mat(4,1,CV_64F), int _flags=cv::ITERATIVE,
@@ -127,6 +128,7 @@ public:
     {
         Mat opoints = _m1.getMat(), ipoints = _m2.getMat();
 
+
         bool correspondence = cv::solvePnP( _m1, _m2, cameraMatrix, distCoeffs,
                                             rvec, tvec, useExtrinsicGuess, flags );
 
@@ -148,6 +150,7 @@ public:
         Mat _rvec = model.col(0);
         Mat _tvec = model.col(1);
 
+
         Mat projpoints(count, 2, CV_32FC1);
         cv::projectPoints(opoints, _rvec, _tvec, cameraMatrix, distCoeffs, projpoints);