resolved commit conflict in changelog (minor)

diff --git a/ChangeLog b/ChangeLog
index 254e8fcec32154c9e1b2efff0b5af0b8576680d3..6069b3de2f387fe6ec3218014c5828ede77b384c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 
 2001-04-10  jeff b  <jeff@univrel.pr.uconn.edu>  
 
+       * configure.in, acconfig.h, etc/afpd/uam.c: patch submitted by Jason
+       Kelitz (jkeltz) to allow disabling of shell checking
+
        * configure.in, contrib/Makefile.am: made timelord compilation
        optional, disabled by default