[project @ 2000-08-15 14:18:43 by simonmar]

[ghc-hetmet.git] / ghc / interpreter / timer.c

diff --git a/ghc/interpreter/timer.c b/ghc/interpreter/timer.c
index 0b0e697..dd067ac 100644 (file)
--- a/ghc/interpreter/timer.c
+++ b/ghc/interpreter/timer.c
@@ -1,4 +1,7 @@
-/* -*- mode: hugs-c; -*- */
+<<<<<<<<<<<<<< variant A
+
+>>>>>>>>>>>>>> variant B
+======= end of combination
 /* --------------------------------------------------------------------------
  * This file provides a simple mechanism for measuring elapsed time on Unix
  * machines (more precisely, on any machine with an rusage() function).
@@ -21,13 +24,15 @@
  * optimizations, means that there are much more significant overheads than
  * can be accounted for by small variations in Hugs code.
  *
- * Copyright (c) The University of Nottingham and Yale University, 1994-1997.
- * All rights reserved. See NOTICE for details and conditions of use etc...
- * Hugs version 1.4, December 1997
+ * The Hugs 98 system is Copyright (c) Mark P Jones, Alastair Reid, the
+ * Yale Haskell Group, and the Oregon Graduate Institute of Science and
+ * Technology, 1994-1999, All rights reserved.  It is distributed as
+ * free software under the license in the file "License", which is
+ * included in the distribution.
  *
  * $RCSfile: timer.c,v $
- * $Revision: 1.2 $
- * $Date: 1998/12/02 13:22:46 $
+ * $Revision: 1.4 $
+ * $Date: 1999/10/15 21:41:00 $
  * ------------------------------------------------------------------------*/