X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/5dab018df57f29c6230e66fc3dcfc56919425b3f..be9b5b23f584d08adcee0d3ca4a31558c1aa938d:/cypress/integration/collection.spec.js

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');
                     });