Actually fixing merge conflict error

Author: bdlafleur

armi/reactor/tests/test_blocks.py

@@ -1828,7 +1828,7 @@ def test_component_type(self):
         """
         Test that a hex block has the proper "hexagon" __name__.
 
-        .. test:: Ability to create hex shaped blocks
+        .. test:: Users can create hex shaped blocks.
             :id: T_ARMI_BLOCK_HEX
             :tests: R_ARMI_BLOCK_HEX
         """
@@ -1871,7 +1871,7 @@ def test_block_dims(self):
         Tests that the block class can provide basic dimensionality information about
         itself.
 
-        .. test:: Users can create hex shaped blocks.
+        .. test:: Important block dimensions are retrievable.
             :id: T_ARMI_BLOCK_DIMS
             :tests: R_ARMI_BLOCK_DIMS
         """