nuke leftover conflict marker

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

diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog
index c6f7072903e0dcb27b08424715331d484c4ca8d7..6edc924c9092b3b0ba71f422d1044a92abca1c46 100644 (file)
--- a/src/lib/crypto/des/ChangeLog
+++ b/src/lib/crypto/des/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 Sat Jun 15 03:51:19 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
        * Makefile.in (clean): Add space before \