[Eliot-dev] Changes to eliot/game/rack.h [antoine-1]

[eliot-dev]

Index: eliot/game/rack.h
diff -u eliot/game/rack.h:1.5.2.1 eliot/game/rack.h:1.5.2.2
--- eliot/game/rack.h:1.5.2.1   Sun Oct 23 17:16:24 2005
+++ eliot/game/rack.h   Sun Oct 23 18:38:18 2005
@@ -3,11 +3,6 @@
  * Authors: Antoine Fraboulet <address@hidden>
  *          Olivier Teuliere  <address@hidden>
  *
-<<<<<<< rack.h
-=======
- * $Id: rack.h,v 1.5.2.1 2005/10/23 17:16:24 afrab Exp $
- *
->>>>>>> 1.5
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -23,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *****************************************************************************/
 
-/* $Id: rack.h,v 1.5.2.1 2005/10/23 17:16:24 afrab Exp $ */
+/* $Id: rack.h,v 1.5.2.2 2005/10/23 18:38:18 afrab Exp $ */
 
 /**
  *  \file   rack.h