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-b93c2d0d6712
2007-06-02 12:15:20 +00:00 · 2007-06-02 12:15:20 +00:00 · 59701ad06b
parent 6e00fd82f1
commit 59701ad06b
1 changed files with 1 additions and 0 deletions
--- a/light/flint_and_steel.arc
+++ b/light/flint_and_steel.arc
@ -11,4 +11,5 @@ editable 128
 magicmap grey
 name_pl flints and steels
 client_type 1101
+nrof 1
 end