diff options
| author | Mark Eichin <eichin@mit.edu> | 1996-10-31 01:03:53 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1996-10-31 01:03:53 +0000 |
| commit | 4539615ff9a8ac971d22cb59d734e4710ab5eafc (patch) | |
| tree | a42a1117861ee8cdbd9cf721f3a2efd40175a0fd | |
| parent | ce2cef127e4f47e2810f6b3a5c5c4350af570a56 (diff) | |
| download | krb5-4539615ff9a8ac971d22cb59d734e4710ab5eafc.tar.gz krb5-4539615ff9a8ac971d22cb59d734e4710ab5eafc.tar.xz krb5-4539615ff9a8ac971d22cb59d734e4710ab5eafc.zip | |
nuke leftover conflict marker
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9255 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/crypto/des/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index c6f7072903..6edc924c90 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 \ |