From 4bb7ae516680376582878fbd297e488f83e68db8 Mon Sep 17 00:00:00 2001
From: akirschbaum <akirschbaum@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Fri, 12 Dec 2008 18:34:31 +0000
Subject: [PATCH] Fix duplicate archetype definition for "troll".

git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@10936 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 CHANGES                       | 4 ++++
 monster/troll/Troll/troll.arc | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 5ae887e13..db64a423e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes for SVN top of tree:
 
+monster/troll/Troll/troll.arc
+Fix duplicate archetype definition for "troll".
+Andreas Kirschbaum 2008-12-12
+
 gods/items/valkyrie_amulet_lifesave.arc
 Changes to the amulet so that the item appears as
 "Valkyrie's Amulet of Lifesaving" instead of
diff --git a/monster/troll/Troll/troll.arc b/monster/troll/Troll/troll.arc
index 847cbf608..bf60a2608 100644
--- a/monster/troll/Troll/troll.arc
+++ b/monster/troll/Troll/troll.arc
@@ -32,7 +32,7 @@ body_skill 1
 body_arm 2
 end
 More
-Object troll
+Object troll_2
 name troll
 face troll.x11
 animation troll