User: mikael Date: 2005-09-02 18:02:32 Module: ERP5Form oups, conflict not resolved M __init__.py http://cvs.erp5.org/ERP5Form/__init__.py.diff?r1=2.13&r2=2.14 -- Generated by cvsdigest 1.2 http://www.nongnu.org/cvsdigest/