diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2009-01-09 00:07:50 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2009-01-09 00:07:50 +0000 |
| commit | 089288db70004da0f97e9014713c10497b8d9672 (patch) | |
| tree | fe0db64e72cda9ef2b71bf45f161b71bfe615086 /src/include/CredentialsCache.h | |
| parent | 12cc35712c4d82f8c23d8156d9607d422e40919d (diff) | |
| download | krb5-089288db70004da0f97e9014713c10497b8d9672.tar.gz krb5-089288db70004da0f97e9014713c10497b8d9672.tar.xz krb5-089288db70004da0f97e9014713c10497b8d9672.zip | |
Remove conflict marker; restore broken copyright line
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21719 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include/CredentialsCache.h')
0 files changed, 0 insertions, 0 deletions