nuke leftover conflict marker
authorMark Eichin <eichin@mit.edu>
Thu, 31 Oct 1996 01:03:53 +0000 (01:03 +0000)
committerMark Eichin <eichin@mit.edu>
Thu, 31 Oct 1996 01:03:53 +0000 (01:03 +0000)
commit4539615ff9a8ac971d22cb59d734e4710ab5eafc
treea42a1117861ee8cdbd9cf721f3a2efd40175a0fd
parentce2cef127e4f47e2810f6b3a5c5c4350af570a56
nuke leftover conflict marker

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9255 dc483132-0cff-0310-8789-dd5450dbe970
src/lib/crypto/des/ChangeLog