From ecd6f16dbef7a73bb285a583ae71bc63962d0498 Mon Sep 17 00:00:00 2001
From: sessleral71711 <sessleral71711@th-nuernberg.de>
Date: Tue, 14 Jun 2022 11:52:04 +0200
Subject: [PATCH] merge konflikt behoben

---
 Top/Top.sv | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/Top/Top.sv b/Top/Top.sv
index cfdcbd1..81790ae 100644
--- a/Top/Top.sv
+++ b/Top/Top.sv
@@ -1,7 +1,6 @@
 `include "../spi_interface.v"
 `include "../fsm/Fsm.sv"
 <<<<<<< HEAD
-`include "../Bus_if/Bus_if.sv"
 =======
 >>>>>>> b8d8341 (Initalized top level design)
 
@@ -10,18 +9,7 @@ module Top(
 );
     // Bus (Interface)
 <<<<<<< HEAD
-    Bus_if bus(.clk(clk));
-    // SPI Interface
-    // FSM
-    Fsm fsm(
-        .clk(clk),
-        .inAlarmAmpel(bus.AlarmAmpel),
-        .inDataValid(bus.DataValid),
-        .inTasteAktiv(bus.TasteAktiv),
-        .outAlarm_R(bus.Alarm_R),
-        .outSendData(bus.SendData),
-        .outTimerEN(bus.TimerEN)
-    );
+
 =======
     // SPI Interface
     // FSM