From a56040a09ed8621a862912a4f8cc54d69cf81c9c Mon Sep 17 00:00:00 2001
From: Mikael Djurfeldt <djurfeldt@nada.kth.se>
Date: Tue, 21 Dec 1999 21:47:54 +0000
Subject: [PATCH] *** empty log message ***

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

diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 2fd795ec5..2aa190672 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -57,7 +57,6 @@ Sat Dec 18 15:22:10 1999  Greg J. Badros  <gjb@cs.washington.edu>
 	argument name was the explicit argument in the old function call.
 	These were just missed in my first pass of changes.
 
->>>>>>> 1.715
 1999-12-18  Mikael Djurfeldt  <mdj@thalamus.nada.kth.se>
 
 	* guile-doc-snarf.in (filename): Strip path to source dir before