Fix merge problem.

[users/heiko/exim.git] / src / exim_monitor / em_xs.c

diff --git a/src/exim_monitor/em_xs.c b/src/exim_monitor/em_xs.c
index a6fe64be3968d72d70ba7c802af68865bf4ecc44..87371b50c6e1be2eab05710fe2af886090f5460c 100644 (file)
--- a/src/exim_monitor/em_xs.c
+++ b/src/exim_monitor/em_xs.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/exim_monitor/em_xs.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */
-

 /*************************************************
 *               Exim Monitor                     *
 *************************************************/
 
 /*************************************************
 *               Exim Monitor                     *
 *************************************************/
 

-/* Copyright (c) University of Cambridge, 1995 - 2005 */
+/* Copyright (c) University of Cambridge, 1995 - 2007 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This file contains a number of subroutines that are in effect
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* This file contains a number of subroutines that are in effect