17579: fix for wrong conflict resolution

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>

diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js
index a22ec37d4acbfb560da2c714d1961ebb5409007c..6c1727fb453ffdd0e89254fd382cd9c4465bfd6e 100644 (file)
--- 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');
                     });