svn rev #21719: trunk/src/lib/gssapi/krb5/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21719
Commit By: raeburn
Log Message:
Remove conflict marker; restore broken copyright line.


Changed Files:
U   trunk/src/lib/gssapi/krb5/init_sec_context.c
Modified: trunk/src/lib/gssapi/krb5/init_sec_context.c
===================================================================
--- trunk/src/lib/gssapi/krb5/init_sec_context.c	2009-01-07 18:13:30 UTC (rev 21718)
+++ trunk/src/lib/gssapi/krb5/init_sec_context.c	2009-01-09 00:07:50 UTC (rev 21719)
@@ -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