On Saturday, July 26, 2003, at 02:19 AM, Pete French wrote:



I think something broke in CVS - the target.make file looks like this at line 244:

<<<<<<< target.make
  INTERNAL_OBJCFLAGS += -no-cpp-precomp
=======
  # TODO - Check if we can do without -no-cpp-precomp for Objective-C.
  INTERNAL_OBJCFLAGS += -no-cpp-precomp


That's a problem on your machine, you will have modified the file locally,
then updated from CVS and thewre will have been a conflict between your
local version of the file and the CVS version. The sequence


<<<<<<<
some code
=======
some more code
>>>>>>>

points out the differences between your local code and CVS

The cvs command will have flagged up files containing conflicts when
you did an update, but you may not have noticed it.






_______________________________________________ Bug-gnustep mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/bug-gnustep

Reply via email to