17995: Fix merge error.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/services/api/test/functional/arvados/v1/collections_controller_test.rb b/services/api/test/functional/arvados/v1/collections_controller_test.rb
index d9e90957553ee6c94774abc0702b0a7b216cb5f0..eac393104cf9b5a63355d131d9b09dbd8ca1a5a1 100644 (file)
--- a/services/api/test/functional/arvados/v1/collections_controller_test.rb
+++ b/services/api/test/functional/arvados/v1/collections_controller_test.rb
@@ -1461,5 +1461,4 @@ EOS
       end
     end
   end
->>>>>>> main
 end