17995: Fix merge error.
authorTom Clegg <tom@curii.com>
Wed, 1 Sep 2021 18:38:40 +0000 (14:38 -0400)
committerTom Clegg <tom@curii.com>
Wed, 1 Sep 2021 18:38:40 +0000 (14:38 -0400)
commitf2ce99ebb4c721de5b22da4bd5bd6565d5f08d2e
treecc0c6590a00caf59c4ab09a1cf22589f72b68443
parent30bd9f9ef5cda55548e0391f7925317cb65b6d9f
17995: Fix merge error.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
services/api/test/functional/arvados/v1/collections_controller_test.rb