Remove conflict marker; restore broken copyright line
authorKen Raeburn <raeburn@mit.edu>
Fri, 9 Jan 2009 00:07:50 +0000 (00:07 +0000)
committerKen Raeburn <raeburn@mit.edu>
Fri, 9 Jan 2009 00:07:50 +0000 (00:07 +0000)
commit089288db70004da0f97e9014713c10497b8d9672
treefe0db64e72cda9ef2b71bf45f161b71bfe615086
parent12cc35712c4d82f8c23d8156d9607d422e40919d
Remove conflict marker; restore broken copyright line

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21719 dc483132-0cff-0310-8789-dd5450dbe970
src/lib/gssapi/krb5/init_sec_context.c