[ARVADOS-WORKBENCH2] updated: 2.3.0-31-gbe9b5b23

[Git user]

Summary of changes:
 cypress/integration/collection.spec.js | 4 ----
 1 file changed, 4 deletions(-)

       via  be9b5b23f584d08adcee0d3ca4a31558c1aa938d (commit)
      from  5dab018df57f29c6230e66fc3dcfc56919425b3f (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 be9b5b23f584d08adcee0d3ca4a31558c1aa938d
Author: Daniel Kutyła <daniel.kutyla at contractors.roche.com>
Date:   Wed Dec 8 21:44:42 2021 +0100

    17579: fix for wrong conflict resolution
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla at contractors.roche.com>

diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js
index a22ec37d..6c1727fb 100644
--- a/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@ -866,11 +866,7 @@ describe('Collection panel tests', function () {
                         cy.get('[data-cy=form-submit-btn]').click();
 
                         cy.get('button[aria-label=Remove]').should('exist');
-<<<<<<< HEAD
-                        cy.get('button[aria-label=Remove]').click({ multiple: true });
-=======
                         cy.get('button[aria-label=Remove]').click({ multiple: true, force: true });
->>>>>>> a4391aa3... 17579: Fix for collection cypress failure
 
                         cy.get('[data-cy=form-submit-btn]').should('not.exist');
                     });

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


hooks/post-receive
--