Ok, done and fixed, thank you very much :)

2009/8/12 Milena <testeador01@gmail.com>
It's modified because it wouldn't compile with those "<<<<<<" at the end of the file

2009/8/12 Michael Jerris <mike@jerris.com>

The M in the version number means modified.  You had local code
changes that conflicted when you updated trunk.  Revert the changes to
that file and it should be fine.

Mike

On Aug 12, 2009, at 10:59 AM, Milena <testeador01@gmail.com> wrote:

> I just did a rebootstrap on a fs box, it turned out the new revision
> has this at the end of mod_sofia.h:
>
> char *sofia_glue_get_extra_headers(switch_channel_t *channel, const
> char *prefix);
> <<<<<<< .mine
> void sofia_glue_set_extra_headers(switch_channel_t *channel, sip_t
> const *sip, const char *prefix);
>
> =======
> void sofia_glue_set_extra_headers(switch_channel_t *channel, sip_t
> const *sip, const char *prefix);
> >>>>>>> .r14490
>
> no wonder why it wouldn't compile :P
>
>