From 23981977f38d1609dc22fba594e87f9fb01ffc55 Mon Sep 17 00:00:00 2001
From: Lorenzo Marcantonio <l.marcantonio@logossrl.com>
Date: Tue, 2 Apr 2013 18:04:12 +0200
Subject: [PATCH] Fixed idiotic merge error in busentry handling

---
 eeschema/busentry.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eeschema/busentry.cpp b/eeschema/busentry.cpp
index 2066aba264..a9f6f70755 100644
--- a/eeschema/busentry.cpp
+++ b/eeschema/busentry.cpp
@@ -73,10 +73,6 @@ void SCH_EDIT_FRAME::SetBusEntryShape( wxDC* DC, SCH_BUS_ENTRY_BASE* BusEntry, c
 {
     if( BusEntry == NULL )
         return;
-    {
-        DisplayError( this, wxT( "SetBusEntryType: Bad StructType" ) );
-        return;
-    }
 
     /* Put old item in undo list if it is not currently in edit */
     if( BusEntry->GetFlags() == 0 )