[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Dolibarr-dev] error retrieving cvs

From: Dhr. R. R. Gerbrands
Subject: [Dolibarr-dev] error retrieving cvs
Date: Mon, 29 Mar 2010 10:38:13 +0200

I get again and again this error:

update -d -P htdocs
RCS file: /sources/dolibarr/dolibarr/htdocs/commonobject.class.php,v
retrieving revision 1.71
retrieving revision 1.74
Merging differences between 1.71 and 1.74 into commonobject.class.php
rcsmerge: warning: conflicts during merge

Is someone still working with commonobject.class.php for 24 hours a day? LOL!


reply via email to

[Prev in Thread] Current Thread [Next in Thread]