On 8/13/07, Alfredo Braunstein <[EMAIL PROTECTED]> wrote: > I wonder the reason for this kind of changes on trunk. It certainly makes > compilation a bit difficult... ;-) > > +<<<<<<< .mine > +#include "BufferParams.h" > +======= > #include "Counters.h" > +>>>>>>> .r19497
Isn't this the result of conflict? Bo
