[poppler] poppler: ChangeLog,1.509,1.510

[Vincent Torri]

On Sun, 29 Apr 2007, Jeff Muizelaar wrote:

Is it normal to have those '>>>>>>' ?

> +>>>>>>> 1.509
> 2007-04-15  Pino Toscano <pino at kde.org>
> 	reviewed by: Albert Astals Cid <aacid at kde.org>

It usually means that there is a conflict, no ? (well, it's about the 
ChangeLog, so it's not really a problem)

Vincent