crossfire
/
arch
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
gros 2007-11-18 16:40:02 +00:00
parent 4c349dfcaf
commit 125776aabe
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
player/race/fenx.arc
View File

@ -92,7 +92,6 @@ fenx_sword.172
fenx_sword.171 fenx_sword.171
facings 4 facings 4
mina mina
<<<<<<< .mine
end end
Object fenx_player_spellcasting Object fenx_player_spellcasting
anim anim
@ -111,6 +110,3 @@ fenx_spellcasting.151
facings 4 facings 4
mina mina
end end
=======
end
>>>>>>> .r7528