No reason those aren't mergeable.
git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@6385 282e977c-c81d-0410-88c4-b93c2d0d6712master
parent
6e00fd82f1
commit
59701ad06b
|
|
@ -11,4 +11,5 @@ editable 128
|
||||||
magicmap grey
|
magicmap grey
|
||||||
name_pl flints and steels
|
name_pl flints and steels
|
||||||
client_type 1101
|
client_type 1101
|
||||||
|
nrof 1
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue