[ARVADOS] updated: 2.1.0-1281-gf2ce99ebb

[Git user]

Summary of changes:
 services/api/test/functional/arvados/v1/collections_controller_test.rb | 1 -
 1 file changed, 1 deletion(-)

       via  f2ce99ebb4c721de5b22da4bd5bd6565d5f08d2e (commit)
      from  30bd9f9ef5cda55548e0391f7925317cb65b6d9f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f2ce99ebb4c721de5b22da4bd5bd6565d5f08d2e
Author: Tom Clegg <tom at curii.com>
Date:   Wed Sep 1 14:38:40 2021 -0400

    17995: Fix merge error.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at 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 d9e909575..eac393104 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

-----------------------------------------------------------------------


hooks/post-receive
--