From add085032f4694dece32c11662cbdfe0c5b29043 Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Sat, 10 May 2003 01:27:15 +0000 Subject: [PATCH] punt leftover conflict markers git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15410 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/krb/ChangeLog | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 62e652d66..d6663bfe8 100644 --- 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 * 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 * init_ctx.c (DEFAULT_ETYPE_LIST): Add AES with 256 bits at the -- 2.26.2