From 30ab21a355281cee3960062ab616ab8b4fa795ca Mon Sep 17 00:00:00 2001
From: Martin Kretzschmar <martink@src.gnome.org>
Date: Sat, 02 Jul 2005 15:08:14 +0000
Subject: Removed conflict markers from ChangeLog

---
(limited to 'shell/ev-pixbuf-cache.c')

--
cgit v0.9.1