remove spurious conflict marker from ChangeLog

svn path=/trunk/; revision=17527
2007-03-15 21:00:07 +00:00
parent 51aba36991
commit b55d6e4bc9
1 changed files with 0 additions and 1 deletions
--- a/1
+++ b/1
@@ -51,7 +51,6 @@

 2007-03-15  Emmanuele Bassi  <ebassi@gnome.org>

->>>>>>> .r17523
 	* gtk/gtkrecentchooserprivate.h:
 	* gtk/gtkrecentchooserutils.c: Move filtering of the recent
 	files list into the shared implementation; do the filtering