From 125776aabe43d154f2398624b86b76ace89e66ca Mon Sep 17 00:00:00 2001
From: gros <gros@282e977c-c81d-0410-88c4-b93c2d0d6712>
Date: Sun, 18 Nov 2007 16:40:02 +0000
Subject: [PATCH] Corrected a typo caused by previous commit conflict.

git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@7530 282e977c-c81d-0410-88c4-b93c2d0d6712
---
 player/race/fenx.arc | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/player/race/fenx.arc b/player/race/fenx.arc
index 622c30500..a266a3ca6 100644
--- a/player/race/fenx.arc
+++ b/player/race/fenx.arc
@@ -92,7 +92,6 @@ fenx_sword.172
 fenx_sword.171
 facings 4
 mina
-<<<<<<< .mine
 end
 Object fenx_player_spellcasting
 anim
@@ -111,6 +110,3 @@ fenx_spellcasting.151
 facings 4
 mina
 end
-=======
-end
->>>>>>> .r7528