From 4d8c013104bc6970f1a05ceef396ecb890140e68 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 21 Aug 2007 09:08:45 +0000
Subject: [PATCH] Removed a CVS conflict line which had been inadvertently
 committed.

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

diff --git a/ChangeLog b/ChangeLog
index 0e96c44fbe..558e3e4055 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -85,7 +85,6 @@ Mon Aug 13 20:13:48 EST 2007 Daniel P. Berrange <berrange@redhat.com>
 	avoid bug where QEMU \n gets translated to \r\n,then causing QEMU
 	to process the command twice. Patch from Jim Paris.
 
->>>>>>> 1.700
 Mon Aug 13 11:55:48 CEST 2007 Daniel Veillard <veillard@redhat.com>
 
 	* src/qemu_driver.c: patch from Jim Paris removing memory leak
-- 
GitLab