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 | |
| 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
| -rw-r--r-- | src/lib/gssapi/krb5/init_sec_context.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c index 1b1e11d6f0..8744590e1c 100644 --- a/src/lib/gssapi/krb5/init_sec_context.c +++ b/src/lib/gssapi/krb5/init_sec_context.c @@ -1,7 +1,6 @@ /* -*- mode: c; indent-tabs-mode: nil -*- */ /* - * Copyright 2000, 2002, 2003, 2007, 2008 ->>>>>>> trunk:src/lib/gssapi/krb5/init_sec_context.c + * Copyright 2000, 2002, 2003, 2007, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may |