Fix merge conflicts

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

diff --git a/warp/them.h b/warp/them.h
index ba541626fade38db31fdae2bd2f6c7580b368583..ab527e8a7e797f9d145f34761f24d5759c6c2b06 100644 (file)
--- a/warp/them.h
+++ b/warp/them.h
@@ -3,7 +3,7 @@
 /* Log:        them.h,v
  * Revision 7.0  86/10/08  15:14:19  lwall
  * Split into separate files.  Added amoebas and pirates.
- * 
+ *
  */
 
 void them_init(void);