Resolve merge conflict.

alliepiper · alliepiper · commit fa54f2c6f121 · 2021-04-08T10:31:39.000-04:00
diff --git a/testing/async_reduce.cu b/testing/async_reduce.cu
@@ -973,7 +973,6 @@ struct test_async_reduce_allocator_on_then_after
     );
 
     KNOWN_FAILURE;
-#if 0
     // FIXME: The below fails because you can't combine allocator attachment,
     // `.on`, and `.after`.
     // The `#if 0` can be removed once the KNOWN_FAILURE is resolved.
