Removed a CVS conflict line which had been inadvertently committed.

diff --git a/ChangeLog b/ChangeLog
index 0e96c44fbe0fe4ebd30ab94961a9c2cf649eb621..558e3e40556679d6a97441c2b1b7e346dfed66bc 100644 (file)
--- 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