Hi David,
This is probably another CVS update conflict; in the future, make sure you watch for warning messages when you update the checkout. You can find conflicts by searching the code for "<<<<<<" -- either using the "Find" tool in Windows, or the "grep" tool in Linux. I use:
- Code: Select all
fgrep -l "<<<<<<" `find /path/to/ocs2 -type f`
(Note the "`" characters are backticks, not apostrophes.)
Regards,
Alec Smecher
Public Knowledge Project Team
---
Don't miss the First International PKP Scholarly Publishing Conference
July 11 - 13, 2007, Vancouver, BC, Canada
http://ocs.sfu.ca/pkp2007/