resolved conflict

Author: JEJodesty

src/koi_net/base.py

@@ -6,14 +6,8 @@
 import structlog
 from structlog.contextvars import bound_contextvars
 
-<<<<<<< Updated upstream:src/koi_net/base.py
 from .infra import Assembler
 from .components import LoggingContext
-=======
-from .assembler import NodeAssembler
-from ..components import LoggingContext
->>>>>>> Stashed changes:src/koi_net/build/base.py
-
 
 class BaseAssembly(Assembler):
     root_dir: Path