From 9dde26770cca383d5fd43eb20cde0f0d1a45877c Mon Sep 17 00:00:00 2001
From: Brian Matherly <brian@gramps-project.org>
Date: Sun, 4 Feb 2007 02:21:43 +0000
Subject: [PATCH] typo

svn: r8044
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e6d1682e2..17fbb1bfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,6 @@
 	* src/GrampsDb/Makefile.am: update
 	* src/Makefile.am: update
 
->>>>>>> .r8042
 2007-01-26 Richard Taylor  <rjt-gramps@thegrindstone.me.uk>
         * src/GrampsDb/Makefile.am: remove files
 	* src/GrampsDb/_GrampsDbConst.py: add license