resolved conflicts

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@8845 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/ChangeLog b/src/ChangeLog
index 59f329bc2a057d1d7c8fb70e94bff0925f321830..3ae53e19e0f7a2a9184f9386329cb64494dc6278 100644 (file)
--- 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