[poppler] poppler: ChangeLog,1.510,1.511

[Albert Astals Cid]

Update of /cvs/poppler/poppler
In directory kemper:/tmp/cvs-serv20825

Modified Files:
	ChangeLog 
Log Message:
jeff committed this line by mistake


Index: ChangeLog
===================================================================
RCS file: /cvs/poppler/poppler/ChangeLog,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -d -r1.510 -r1.511
--- ChangeLog	29 Apr 2007 17:33:58 -0000	1.510
+++ ChangeLog	29 Apr 2007 17:37:38 -0000	1.511
@@ -241,7 +241,6 @@
 	* utils/pdftotext.cc:
 	Merge xpdf 3.02 changes
 
->>>>>>> 1.509
 2007-04-15  Pino Toscano <pino at kde.org>
 	reviewed by: Albert Astals Cid <aacid at kde.org>