No reason those items aren't mergeable.
git-svn-id: svn+ssh://svn.code.sf.net/p/crossfire/code/arch/trunk@6303 282e977c-c81d-0410-88c4-b93c2d0d6712master
parent
356c852e95
commit
2c1a0e07b7
|
@ -27,4 +27,5 @@ type 72
|
|||
face icor.111
|
||||
food 1
|
||||
weight 20
|
||||
nrof 1
|
||||
end
|
||||
|
|
|
@ -27,4 +27,5 @@ type 72
|
|||
face residue.111
|
||||
food 1
|
||||
weight 20
|
||||
nrof 1
|
||||
end
|
||||
|
|
|
@ -36,4 +36,5 @@ face skin.111
|
|||
type 72
|
||||
food 5
|
||||
weight 7
|
||||
nrof 1
|
||||
end
|
||||
|
|
|
@ -35,4 +35,5 @@ face residue.111
|
|||
type 72
|
||||
food 2
|
||||
weight 2
|
||||
nrof 1
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue