remove cvs conflict marker, wrap some long lines
authorKen Raeburn <raeburn@mit.edu>
Wed, 13 Mar 1996 04:35:37 +0000 (04:35 +0000)
committerKen Raeburn <raeburn@mit.edu>
Wed, 13 Mar 1996 04:35:37 +0000 (04:35 +0000)
commitda26b0f4f3837c1542e7fa30eb2011ab769db14a
tree7aef43a10eeba38a070360c4c8587edee68a1662
parent9728f668e17d830b92faf3176f6f140e126a5a5f
remove cvs conflict marker, wrap some long lines

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7614 dc483132-0cff-0310-8789-dd5450dbe970
src/appl/bsd/ChangeLog