openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed a CVS conflict line which had been inadvertently committed.

This commit is contained in:
Richard W.M. Jones 2007-08-21 09:08:45 +00:00
parent 19e21d8672
commit 4d8c013104
1 changed files with 0 additions and 1 deletions

1
ChangeLog
View File

@ -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