Fix merge conflicts

[bsdgames-darwin.git] / warp / util.h

diff --git a/warp/util.h b/warp/util.h
index fae72785f6eebf6706bb6ba7759691fb3b7cbb7b..a86f5c8d8dc94048442e6195f21f716794e74469 100644 (file)
--- a/warp/util.h
+++ b/warp/util.h
@@ -3,7 +3,7 @@
 /* Log:        util.h,v
  * Revision 7.0  86/10/08  15:14:37  lwall
  * Split into separate files.  Added amoebas and pirates.
- * 
+ *
  */
 
 #include <time.h>