make it clear that path blending is currently not available

2013-12-20 14:56:48 +01:00
parent 60181ca9f9
commit 7ec4165fc2
2 changed files with 3 additions and 5 deletions
--- a/1
+++ b/1
@ -38,7 +38,6 @@ while True :
        break

 robot.movel(x, y, z, rx, ry, rz), wait=False)
->>>>>>> 43397b6cea74844db7a98bc58649fda3fce86cba
 while.robot.getForce() < 50:
    sleep(0.01)
    if not robot.is_program_running():