From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 21 Aug 2007 09:08:45 +0000 (+0000)
Subject: Removed a CVS conflict line which had been inadvertently committed.
X-Git-Tag: LIBVIRT_0_3_2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d8c013104bc6970f1a05ceef396ecb890140e68;p=thirdparty%2Flibvirt.git

Removed a CVS conflict line which had been inadvertently committed.
---

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