|
From: | Andreas Hoeschler |
Subject: | Re: Building core/back does not work anymore (config.make broken) |
Date: | Tue, 10 Dec 2002 14:06:08 +0100 |
Dear David,
the file seems to have been edited manually on your system and then updated though cvs. If cvs finds confilcts (changes at the same place in the local version and cvs verson) it leaves both versions of the changed code there for you to resolve the conflict manually. Therefor just change:
Thanks, that did it! Regards, Andreas
[Prev in Thread] | Current Thread | [Next in Thread] |