Forgot to merge tripwire rolls.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1797 4f8fa57e-7814-0410-bad4-adc449f26b7c
This commit is contained in:
Flugente
2013-09-29 17:35:21 +00:00
parent 14333998a1
commit b85ae40af9
@@ -5808,4 +5808,12 @@
<mergeType>1</mergeType>
<APCost>32</APCost>
</MERGE>
<MERGE>
<firstItemIndex>1640</firstItemIndex>
<secondItemIndex>1640</secondItemIndex>
<firstResultingItemIndex>1640</firstResultingItemIndex>
<secondResultingItemIndex>0</secondResultingItemIndex>
<mergeType>1</mergeType>
<APCost>32</APCost>
</MERGE>
</MERGELIST>