From 62ead76b9a2187d40e34ff312e13b665f46a5f3e Mon Sep 17 00:00:00 2001 From: Nikita Tomashevich Date: Sat, 9 Apr 2022 12:05:45 +0300 Subject: [PATCH] Fix merging (hopefully) --- .../cil/oc2/common/blockentity/InternetGateWayBlockEntity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/li/cil/oc2/common/blockentity/InternetGateWayBlockEntity.java b/src/main/java/li/cil/oc2/common/blockentity/InternetGateWayBlockEntity.java index d5ddbc04..f04e737e 100644 --- a/src/main/java/li/cil/oc2/common/blockentity/InternetGateWayBlockEntity.java +++ b/src/main/java/li/cil/oc2/common/blockentity/InternetGateWayBlockEntity.java @@ -160,7 +160,6 @@ public class InternetGateWayBlockEntity extends ModBlockEntity implements Networ LOGGER.info("Notified clients"); } } - @Override public void sendEthernetFrame(byte[] frame) { LOGGER.trace("Got inbound packet");