[demo] memmo/talos_randomMove_flat and talos_stairs10_random : fix errors...

[demo] memmo/talos_randomMove_flat and talos_stairs10_random : fix errors introduced by previous merge

script/scenarios/memmo/talos_randomMove_flat.py

@@ -108,10 +108,7 @@ floor_Z = 0.
 s0 = sampleRandomStateFlatFloor(fullBody,limbsInContact,floor_Z)
 
 q_init = s0.q()
-<<<<<<< HEAD
 
-=======
->>>>>>> 73ceb29917481d69e8c03ef7bba36d22e18d9958
 q_goal = q_ref[::]
 q_goal[0:7] = tp.ps.configAtParam(pId,tp.ps.pathLength(pId))[0:7]
 q_goal[2] = q_ref[2]

script/scenarios/memmo/talos_stairs10_random_path.py

@@ -2,6 +2,7 @@ from hpp.corbaserver.rbprm.talos_abstract import Robot
 from hpp.gepetto import Viewer
 from hpp.corbaserver import Client
 from hpp.corbaserver import ProblemSolver
+from tools.sample_root_config import generate_random_conf_without_orientation
 import time
 statusFilename = "infos.log"
 Robot.urdfName+="_large"