fixed weird merge conflict

tweaked-programs · Aug 12, 2023 · b5db8fb · b5db8fb
1 parent e0367bb
commit b5db8fb
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/...ic/src/main/java/cc/tweaked_programs/cccbridge/common/minecraft/block/RedRouterBlock.java b/...ic/src/main/java/cc/tweaked_programs/cccbridge/common/minecraft/block/RedRouterBlock.java
@@ -78,11 +78,6 @@ public int getSignal(@NotNull BlockState state, @NotNull BlockGetter level, @Not
         return getDirectSignal(state, level, pos, direction);
     }
 
-    @Override
-    public int getDirectSignal(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
-        return getSignal(state, level, pos, direction);
-    }
-
     @Override
     public InteractionResult onWrenched(BlockState state, UseOnContext context) {
         BlockEntity tileentity = context.getLevel().getBlockEntity(context.getClickedPos());