From a3e419fee052d8ca9fdfcb27cd27b92889605a2a Mon Sep 17 00:00:00 2001
From: Julien Sentier <j.sentier206@laposte.net>
Date: Thu, 23 Feb 2012 13:26:48 +0100
Subject: [PATCH] removing dead code

---
 src/Type.cc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Type.cc b/src/Type.cc
index 4d80eda6f7..82221303af 100644
--- a/src/Type.cc
+++ b/src/Type.cc
@@ -1858,13 +1858,8 @@ BroType* merge_types(const BroType* t1, const BroType* t2)
 
 		if ( t1->IsSet() )
 			return new SetType(tl3, 0);
-		else if ( tg1 == TYPE_TABLE )
-			return new TableType(tl3, y3);
 		else
-			{
-			reporter->InternalError("bad tag in merge_types");
-			return 0;
-			}
+			return new TableType(tl3, y3);
 		}
 
 	case TYPE_FUNC: