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

[eliot-dev]

Index: eliot/game/duplicate.h
diff -u eliot/game/duplicate.h:1.9.2.1 eliot/game/duplicate.h:1.9.2.2
--- eliot/game/duplicate.h:1.9.2.1      Sun Oct 23 17:16:24 2005
+++ eliot/game/duplicate.h      Sun Oct 23 18:44:43 2005
@@ -2,11 +2,6 @@
  * Copyright (C) 2005 Eliot
  * Authors: Olivier Teuliere  <address@hidden>
  *
-<<<<<<< duplicate.h
-=======
- * $Id: duplicate.h,v 1.9.2.1 2005/10/23 17:16:24 afrab Exp $
- *
->>>>>>> 1.9
  * 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
@@ -22,7 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *****************************************************************************/
 
-/* $Id: duplicate.h,v 1.9.2.1 2005/10/23 17:16:24 afrab Exp $ */
+/* $Id: duplicate.h,v 1.9.2.2 2005/10/23 18:44:43 afrab Exp $ */
 
 #ifndef _DUPLICATE_H_
 #define _DUPLICATE_H_