Skip to content

Commit

Permalink
merge conflict rez
Browse files Browse the repository at this point in the history
  • Loading branch information
onufer committed Nov 1, 2024
2 parents 67b1614 + c515233 commit ad99a0c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion doc/release/0.4.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ API Changes
#. Changing the Doppler constant params to ``VOLUME_INTEGRATED``. (`PR#1659 <https://github.com/terrapower/armi/pull/1659>`_)
#. Change ``Operator._expandCycleAndTimeNodeArgs`` to be a non-static method. (`PR#1766 <https://github.com/terrapower/armi/pull/1766>`_)
#. Database now writes state at the last time node of a cycle rather than during the ``DatabaseInterface.interactEOC`` interaction. (`PR#1090 <https://github.com/terrapower/armi/pull/1090>`_)
#. Renaming b.p.buGroup to b.p.envGroup. Environment group captures both burnup and temperature. . (`PR#1987 <https://github.com/terrapower/armi/pull/1987>`_)
#. Renaming ``b.p.buGroup`` to ``b.p.envGroup``. Environment group captures both burnup and temperature. (`PR#1987 <https://github.com/terrapower/armi/pull/1987>`_)

Bug Fixes
---------
Expand Down

0 comments on commit ad99a0c

Please sign in to comment.