resolved conflicts

Manjusha.S · Manjusha.S · commit 8b7072e8e80f · 2022-07-25T14:41:51.000+05:30
diff --git a/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/MoveColumnBetweenGroupsOfDifferentGridSizeTest.xml b/app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderColumnGridTest/MoveColumnBetweenGroupsOfDifferentGridSizeTest.xml
@@ -57,6 +57,5 @@
         </actionGroup>
         <waitForElementVisible selector="{{ColumnOnBackend.displayLabel('1', '8/8')}}" stepKey="verifyOriginalColumnGroup"/>
         <waitForElementVisible selector="{{ColumnOnBackend.displayLabel('2', '6/12')}}" stepKey="verifyMovedColumn"/>
-
     </test>
 </tests>
