From 49c41064073b00f4521ca0dd77b9c8e9d0440fd1 Mon Sep 17 00:00:00 2001
From: Alex Graveley <orph@src.gnome.org>
Date: Wed, 16 May 2001 20:52:55 +0000
Subject: [PATCH] Remove missed conflict

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 43be4fe..0a88ea3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -96,7 +96,6 @@
 	(soup_env_set_fault): new function to associate a SoupFault
 	with a SoupEnv
 
->>>>>>> 1.70
 2001-05-13  Rodrigo Moya <rodrigo@ximian.com>
 
 	* src/soup-core/soup-fault.[ch]: made the SoupFault structure
-- 
2.7.4