[CLEAN] Removed merge conflict trace in the comments

lagadic · Jul 8, 2024 · fc34274 · fc34274
1 parent f228e1e
commit fc34274
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/modules/core/include/visp3/core/vpUnscentedKalman.h b/modules/core/include/visp3/core/vpUnscentedKalman.h
@@ -183,18 +183,6 @@ class VISP_EXPORT vpUnscentedKalman
   typedef std::function<vpColVector(const vpColVector &, const vpColVector &)> vpAddSubFunction;
 
   /**
-<<<<<<< HEAD
-=======
-   * \brief Residual function, which computes either the equivalent of the subtraction in the
-   * state space or the equivalent of the subtraction in the measurement space.
-   * The first argument is the vector to which we must subtract something
-   * and the second argument is the thing to be subtracted. The return is the
-   * result of this "subtraction".
-   */
-  typedef std::function<vpColVector(const vpColVector &, const vpColVector &)> vpAddFunction;
-
-  /**
->>>>>>> master
    * \brief Construct a new vpUnscentedKalman object.
    *
    * \param[in] Q The covariance introduced by performing the prediction step.