with the merge of sources, there is sometimes a problem with bazaar when you edited manually a file, by example server/setup.py that I modified manually. verify line 54 and 81 if you have <<<<<<< TREE ======= and delete this lines, you can delete too in folder server : setup.py.BASE, setup.py.OTHER and setup.py.THIS I build actually and will test for last sources of this morning (sorry for the time to reply, but I just come back of my holidays). bye
-------------------- m2f -------------------- -- http://www.openobject.com/forum/viewtopic.php?p=60222#60222 -------------------- m2f -------------------- _______________________________________________ Tinyerp-users mailing list http://tiny.be/mailman2/listinfo/tinyerp-users
