--- deliantra/server/random_maps/treasure.C	2007/01/17 12:36:31	1.19
+++ deliantra/server/random_maps/treasure.C	2007/01/18 00:06:56	1.20
@@ -1,5 +1,4 @@
 /*
-<<<<<<< treasure.C
  * CrossFire, A Multiplayer game
  *
  * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
@@ -22,30 +21,6 @@
  *
  * The authors can be reached via e-mail at <crossfire@schmorp.de>
  */
-=======
- * CrossFire, A Multiplayer game for X-windows
- * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
- * 
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * The authors can be reached via e-mail at <crossfire@schmorp.de>
- */
->>>>>>> 1.18
 
 /*  placing treasure in maps, where appropriate.  */