clean up more conflicts
authorTom Yu <tlyu@mit.edu>
Fri, 23 Jul 1999 02:38:08 +0000 (02:38 +0000)
committerTom Yu <tlyu@mit.edu>
Fri, 23 Jul 1999 02:38:08 +0000 (02:38 +0000)
commite10b8e7990b22489bb6e44e19ba3cc530cd64a6f
tree09ed117ca364854943a69ba84ec6421bfb326c3d
parentf455652ae5673bdd4beb55c9615483216e72d716
clean up more conflicts

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11580 dc483132-0cff-0310-8789-dd5450dbe970
src/util/autoconf/configure