Removed a CVS conflict line which had been inadvertently committed.

4d8c0131 · Richard W.M. Jones · 19e21d86 · 4d8c0131
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

ChangeLog ChangeLog +0 -1

未找到文件。
--- 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