punt leftover conflict markers

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

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 62e652d667c4193daf4502f1080f0c14c8a0610f..d6663bfe85c38973b5da7a4fda7e7e7ee577d200 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -56,7 +56,6 @@
 
        * chpw.c (krb5int_mk_setpw_req krb5int_rd_setpw_rep): New function
 
-=======
 2003-04-24  Ezra Peisach  <epeisach@mit.edu>
 
        * kfree.c (krb5_free_pwd_sequences): Correction to previous
@@ -67,7 +66,6 @@
        * kfree.c (krb5_free_pwd_sequences): Actually free the entire
        sequence of passwd_phase_elements and not just the first one.
 
->>>>>>> 5.385
 2003-04-13  Ken Raeburn  <raeburn@mit.edu>
 
        * init_ctx.c (DEFAULT_ETYPE_LIST): Add AES with 256 bits at the