From f2ce99ebb4c721de5b22da4bd5bd6565d5f08d2e Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 1 Sep 2021 14:38:40 -0400 Subject: [PATCH] 17995: Fix merge error. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- .../test/functional/arvados/v1/collections_controller_test.rb | 1 - 1 file changed, 1 deletion(-) 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 d9e9095755..eac393104c 100644 --- 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 -- 2.30.2