merge conflict

This commit is contained in:
Christopher Fichtlscherer 2023-01-11 14:17:29 -05:00
parent 50892c61b7
commit 9d86274fcc

View file

@ -224,6 +224,10 @@ class Settings:
weight_windows : WeightWindows iterable of WeightWindows
Weight windows to use for variance reduction
.. versionadded:: 0.13.3
create_delayed_neutrons : bool
Whether delayed neutrons are created in fission.
.. versionadded:: 0.13
weight_windows_on : bool
Whether weight windows are enabled