[algo/jacobian] Fix rebasing

stack-of-tasks · Nov 13, 2024 · 266b7da · 266b7da
1 parent 4613a0f
commit 266b7da
Showing 1 changed file with 0 additions and 9 deletions.
diff --git 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)
       }
     };