summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b50ac18b..add032fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -63,7 +63,6 @@
* Makefile.am (EXTRA_DIST): Include just pango-zip.sh.in in the
tarball, not pango-zip.sh.
->>>>>>> .r2207
2007-01-29 Behdad Esfahbod <behdad@gnome.org>
* === Released 1.14.10 ===