From 089288db70004da0f97e9014713c10497b8d9672 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Fri, 9 Jan 2009 00:07:50 +0000 Subject: [PATCH] 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 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c index 1b1e11d6f..8744590e1 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 -- 2.26.2