From b25da847e069fe2fa82de6986e561360354da807 Mon Sep 17 00:00:00 2001
From: Marc Horowitz <marc@mit.edu>
Date: Fri, 26 Jul 1996 21:24:00 +0000
Subject: [PATCH] resolved conflicts

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8845 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index 59f329bc2..3ae53e19e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jul 26 15:07:51 1996  Marc Horowitz  <marc@mit.edu>
+
+	* aclocal.m4 (LIBS): include -lgen if compile() is present and
+ 	-lkrb5 is used.
+
 Tue Jul 23 00:36:46 1996  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* acconfig.h: Add contents of util/db2/acconfig.h so that
-- 
2.26.2