From e55b54285bcdccbef08667684a88bcc7d788640a Mon Sep 17 00:00:00 2001
From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 5 Apr 2003 22:35:44 +0000
Subject: [PATCH] *** empty log message ***

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

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index d931f7977..6b77b5552 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -483,7 +483,6 @@
 	(scmconfig.h): build scmconfig.h from gen-scmconfig's output.
 	(BUILT_SOURCES): add scmconfig.h.
 
->>>>>>> 1.1798
 2003-03-19  Marius Vollmer  <mvo@zagadka.de>
 
 	* gc_os_dep.c: Added defines for sparc-unknown-netbsdelf1.5 from