Oops forgot >>>>, Daniel

232d4f15 · Daniel Veillard · b33f740e · 232d4f15
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

ChangeLog ChangeLog +0 -1

未找到文件。
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.