From b85ae40af93d39ebe5483c87bb40bda16947769e Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Sun, 29 Sep 2013 17:35:21 +0000
Subject: [PATCH] Forgot to merge tripwire rolls.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1797 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Items/Merges.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gamedir/Data-1.13/TableData/Items/Merges.xml b/gamedir/Data-1.13/TableData/Items/Merges.xml
index 360da2de3..8b65f30a8 100644
--- a/gamedir/Data-1.13/TableData/Items/Merges.xml
+++ b/gamedir/Data-1.13/TableData/Items/Merges.xml
@@ -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>
\ No newline at end of file