From 979121ae12997df0b3d282e6421d25fca2638a72 Mon Sep 17 00:00:00 2001
From: Oystein Eftevaag
Date: Sun, 14 Oct 2007 17:00:44 +0000
Subject: A change got lost while resolving a conflict

svn-id: r29218
---
 engines/kyra/kyra_v2.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index 87ab508773..19a4215680 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -1641,7 +1641,6 @@ void KyraEngine_v2::setupOpcodeTable() {
 		// 0x88
 		Opcode(o2_countItemInstances),
 		OpcodeUnImpl(),
-		OpcodeUnImpl(),
 		Opcode(o2_initObject),
 		OpcodeUnImpl(),
 		// 0x8c
-- 
cgit v1.2.3