Oops forgot >>>>, Daniel

This commit is contained in:
Daniel Veillard 2008-02-07 09:37:41 +00:00
parent b33f740e1f
commit 232d4f157a

View File

@ -221,7 +221,6 @@ Tue Jan 29 18:39:25 CET 2008 Jim Meyering <meyering@redhat.com>
* tests/xencapstest.c: Likewise.
* tests/xmconfigtest.c: Likewise.
>>>>>>> 1.995
Fri Jan 25 12:00:00 BST 2008 Richard W.M. Jones <rjones@redhat.com>
Clarify virsh documentation.