RegularHex Pack, again
Bug #550912 reported by
moradi
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Yade |
Invalid
|
Undecided
|
Unassigned |
Bug Description
Hi Vaclav,
in file pack.py for RegularHex pack in bzr2112
I think y+= hy/2 must be y+= hy/3
also,when run it there is an error:
File "/home/
<<<<<<< TREE
^
SyntaxError: invalid syntax
in file there are these lines:
<<<<<<< TREE
if k%2!=0: x+=a/2.; y+=h/3.
=======
if k%2!=0: x+=a/2.; y+=hy/2.
>>>>>>> MERGE-SOURCE
thank you
Nasibeh Moradi
To post a comment you must log in.
Hi, this is not problem in code itself but on your machine. This <<<<<< TREE etc was inserted by bzr whe you were updating your local branch as there was conflict between your local change and upstream change. See "bzr help conflicts". To simply forget your local changes, do "bzr revert py/pack/pack.py".