diff options
| author | Tom Yu <tlyu@mit.edu> | 2003-05-10 01:27:15 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2003-05-10 01:27:15 +0000 |
| commit | add085032f4694dece32c11662cbdfe0c5b29043 (patch) | |
| tree | 3411a66b21d0782f51a4cde0072329ba82777618 /src | |
| parent | f8b2914cc1ba92bdbde0979b0a1344687925945f (diff) | |
punt leftover conflict markers
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15410 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/krb/ChangeLog | 2 |
1 files changed, 0 insertions, 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 <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 |