resolved conflicts

Manjusha.S · Manjusha.S · commit f1c271c4bb58 · 2022-07-25T14:41:06.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,5 +57,6 @@
         </actionGroup>
         <waitForElementVisible selector="{{ColumnOnBackend.displayLabel('1', '8/8')}}" stepKey="verifyOriginalColumnGroup"/>
         <waitForElementVisible selector="{{ColumnOnBackend.displayLabel('2', '6/12')}}" stepKey="verifyMovedColumn"/>
+
     </test>
 </tests>
