Oops forgot >>>>, Daniel

diff --git a/ChangeLog b/ChangeLog
index 92c1bd9f43f102ad8c5b7aee21f7a86c4c1fcc3d..0d7c4cdfacdef32f41cc319b82c11345cedc044e 100644 (file)
--- 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.