resolved merge conflict

Xilinx · Feb 20, 2024 · b827129 · b827129
2 parents 9c40dc0 + caf0338
commit b827129
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 32 deletions.
diff --git a/src/brevitas/nn/__init__.py b/src/brevitas/nn/__init__.py
@@ -19,7 +19,6 @@
 from .quant_convtranspose import QuantConvTranspose1d
 from .quant_convtranspose import QuantConvTranspose2d
 from .quant_convtranspose import QuantConvTranspose3d
-from .quant_dropout import QuantDropout
 from .quant_eltwise import QuantCat
 from .quant_eltwise import QuantEltwiseAdd
 from .quant_embedding import QuantEmbedding

diff --git a/src/brevitas/nn/quant_dropout.py b/src/brevitas/nn/quant_dropout.py