From 32745f7737c512e6781a05f663581ccb6e15dbf9 Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Thu, 10 Nov 2005 19:06:21 +0000
Subject: [PATCH] foo

Original commit message from CVS:
foo
---
 ChangeLog | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9f8cffd..5b595b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4934,8 +4934,6 @@
 
 	* configure.ac:
 	  hunting season on 0.9 is now OPEN
-<<<<<<< ChangeLog
-=======
 
 2005-02-22  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
@@ -20525,5 +20523,3 @@
 
 	* ChangeLog: moved to gstreamer/docs/random/old/ChangeLog.gst-plugins
         * moved CVS to freedesktop.org
-
->>>>>>> 1.1891
-- 
2.7.4