On Tue, 15 Jun 2004, Michael George wrote:
> On line 155 begins a section which almost looks like patch material. > The first line is: > <<<<<<< app_voicemail.c > > and then there is some C code defining adapp and adsec, then > ======= > > and some more C code defining adapp and adsec again, followed by > >>>>>>> 1.111 You made some local changes in app_voicemail.c - or maybe applied a patch that changed app_voicemail.c - and then did a cvs update. There was a conflict between your local change and a change made in CVS. cvs put both versions in your file, delimited as you see. You need to manually merge the two - or maybe drop one and keep the other entirely. Steve _______________________________________________ Asterisk-Users mailing list [EMAIL PROTECTED] http://lists.digium.com/mailman/listinfo/asterisk-users To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/asterisk-users
