1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c8fd10..6976be8 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.