From: Daniel Veillard <veillard@redhat.com>
Date: Thu, 7 Feb 2008 09:37:41 +0000 (+0000)
Subject: Oops forgot >>>>, Daniel
X-Git-Tag: LIBVIRT_0_4_1~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=232d4f157a1a7926eed972d5c1008240959bc521;p=thirdparty%2Flibvirt.git

Oops forgot >>>>, Daniel
---

diff --git a/ChangeLog b/ChangeLog
index 92c1bd9f43..0d7c4cdfac 100644
--- 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.