Re: [Asterisk-Users] files conflict after CVS update

2005-09-29 Thread Michiel van Baak
On 14:58, Thu 29 Sep 05, Claudio Canseco wrote: > Hi all, > I just updated zaptel and asterisk, but after doing CVS update of asterisk > (from CVS-HEAD 2005-08-10 17:10:53) I got a file conflict message > > conflicts: > ast_expr2.h > ast_expr2f.c > > I ignored them, and then tried to compile ast

[Asterisk-Users] files conflict after CVS update

2005-09-29 Thread Claudio Canseco
Hi all,   I just updated zaptel and asterisk, but after doing CVS update of asterisk (from CVS-HEAD 2005-08-10 17:10:53) I got a file conflict message conflicts:ast_expr2.hast_expr2f.c I ignored them, and then tried to compile asterisk: make clean, make , make install. But then the problem shows a