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

[eliot-dev]

Index: eliot/game/player.h
diff -u eliot/game/player.h:1.7.2.1 eliot/game/player.h:1.7.2.2
--- eliot/game/player.h:1.7.2.1 Sun Oct 23 17:16:24 2005
+++ eliot/game/player.h Sun Oct 23 18:38:18 2005
@@ -1,4 +1,3 @@
-<<<<<<< player.h
 /* Copyright (C) 2004-2005 Eliot                                             */
 /* Authors: Olivier Teuliere  <address@hidden>                            */
 /*                                                                           */
@@ -18,7 +17,7 @@
 /* along with this program; if not, write to the Free Software               */
 /* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-/* $Id: player.h,v 1.7.2.1 2005/10/23 17:16:24 afrab Exp $ */
+/* $Id: player.h,v 1.7.2.2 2005/10/23 18:38:18 afrab Exp $ */
 
 /**
  *  \file   player.h
@@ -26,28 +25,6 @@
  *  \author Olivier Teuliere
  *  \date   2005
  */
-=======
-/*****************************************************************************
- * Copyright (C) 2004-2005 Eliot
- * Authors: Olivier Teuliere  <address@hidden>
- *
- * $Id: player.h,v 1.7.2.1 2005/10/23 17:16:24 afrab Exp $
- *
- * 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
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *****************************************************************************/
->>>>>>> 1.7
 
 #ifndef _PLAYER_H_
 #define _PLAYER_H_