From: Mark Eichin <eichin@mit.edu>
Date: Thu, 31 Oct 1996 01:03:53 +0000 (+0000)
Subject: nuke leftover conflict marker
X-Git-Tag: krb5-1.0-freeze1~167
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4539615ff9a8ac971d22cb59d734e4710ab5eafc;p=krb5.git

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 c6f707290..6edc924c9 100644
--- 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 \