From 266b7daef685c52d133f56b0b11d8d16b41146c7 Mon Sep 17 00:00:00 2001
From: Megane Millan <megane.millan@inria.fr>
Date: Wed, 13 Nov 2024 11:27:49 +0100
Subject: [PATCH] [algo/jacobian] Fix rebasing

---
 include/pinocchio/algorithm/jacobian.hxx | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/include/pinocchio/algorithm/jacobian.hxx b/include/pinocchio/algorithm/jacobian.hxx
index 69855d49e..3bf3491b4 100644
--- a/include/pinocchio/algorithm/jacobian.hxx
+++ b/include/pinocchio/algorithm/jacobian.hxx
@@ -56,17 +56,8 @@ namespace pinocchio
         else
           data.oMi[i] = data.liMi[i];
 
-<<<<<<< HEAD
-        Matrix6xLike & J_ = J.const_cast_derived();
-        jmodel.jointCols(J_) = data.oMi[i].act(jdata.S());
-=======
         Matrix6xLike & J_ = PINOCCHIO_EIGEN_CONST_CAST(Matrix6xLike, J);
-<<<<<<< HEAD
-        jmodel.jointVelCols(J_) = data.oMi[i].act(jdata.S());
->>>>>>> a55d3bf7 ([EtienneAr feedback] Split jointCols jointRows and jointBLock for full and reduced system)
-=======
         jmodel.jointJacCols(J_) = data.oMi[i].act(jdata.S());
->>>>>>> 6b22ea5e ([EtienneAr feedback] Fix joint jacobians computation for mimic)
       }
     };