svn rev #21680: branches/mskrb-integ/src/kadmin/server/

[hartmans@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=21680
Commit By: hartmans
Log Message:
fix merge error


Changed Files:
U   branches/mskrb-integ/src/kadmin/server/misc.h
Modified: branches/mskrb-integ/src/kadmin/server/misc.h
===================================================================
--- branches/mskrb-integ/src/kadmin/server/misc.h	2009-01-03 03:00:58 UTC (rev 21679)
+++ branches/mskrb-integ/src/kadmin/server/misc.h	2009-01-03 03:01:10 UTC (rev 21680)
@@ -70,7 +70,7 @@
 gss_to_krb5_name_1(struct svc_req *rqstp, krb5_context ctx, gss_name_t gss_name,
 		   krb5_principal *princ, gss_buffer_t gss_str);
 
-<<<<<<< HEAD:src/kadmin/server/misc.h
+
 extern volatile int signal_request_exit;
 extern volatile int signal_request_hup;
 
@@ -84,8 +84,7 @@
 krb5_error_code listen_and_process(void *handle, const char *prog);
 krb5_error_code closedown_network(void *handle, const char *prog);
 
-#endif /* _MISC_H */
-=======
+
 void 
 krb5_iprop_prog_1(struct svc_req *rqstp, SVCXPRT *transp);
 
@@ -94,4 +93,5 @@
 			     const char *,
 			     char **);
 
->>>>>>> trunk:src/kadmin/server/misc.h
+
+#endif /* _MISC_H */