rm erroneous merge conflict

terrapower · Mar 22, 2024 · 1b76896 · 1b76896
1 parent 49dfddc
commit 1b76896
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/armi/reactor/blueprints/__init__.py b/armi/reactor/blueprints/__init__.py
@@ -85,9 +85,6 @@
 from armi.reactor import assemblies
 from armi.reactor import geometry
 from armi.reactor import systemLayoutInput
-# NOTE: using non-ARMI-standard imports because these are all a part of this package,
-# and using the module imports would make the attribute definitions extremely long
-# without adding detail
 from armi.reactor.blueprints import isotopicOptions
 from armi.reactor.blueprints.assemblyBlueprint import AssemblyKeyedList
 from armi.reactor.blueprints.blockBlueprint import BlockKeyedList