diff --git a/ChangeLog b/ChangeLog
index 8c8fd1080fa9d1d21284630ebd265fda36dae60d..6976be8804236cff2dd91220c6ad8be480584c6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,7 +45,6 @@
 	in the recursive `make', instead of hardwiring `all'.
 	(Autogenerated TARGET-* variables): New.
 
->>>>>>> 1.967
 2004-08-13  Brian Booth  <bbooth@redhat.com>
 
 	* MAINTAINERS: Remove myself from write-after-approval.