From c04189d8a9a876116e7816f17eaf05705e174e4b Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@src.gnome.org>
Date: Thu, 12 Apr 2007 23:57:21 +0000
Subject: Oops.

svn path=/branches/pango-1-14/; revision=2226
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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 ===
-- 
cgit v1.2.1