Yade

  1. Bug #550912
  2. Comment #1

Comment 1 for bug 550912

Revision history for this message
Václav Šmilauer (eudoxos) wrote :

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".