From 5398e697d0e5d13c0756a77b6aad4bb9f559bbf7 Mon Sep 17 00:00:00 2001
From: venkat <venkat@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sun, 12 Jul 2009 00:57:11 +0000
Subject: [PATCH]  Remove stray character left over in r14198.

---
 CHANGELOG | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 35b5f4a7b..1b60cd7ed 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -69,7 +69,6 @@ o [Zenmap] Fixed a display hanging problem on Mac OS X reported by
   files at runtime. Also included GDK pixbuf loaders statically rather
   than as external loadable modules.  [David]
 
->>>>>>> .r14197
 o Fixed a memory bug (access of freed memory) when loading exclude
   targets with --exclude. This was reported to occasionally cause a
   crash. Will Cladek reported the bug and contributed an initial