formatting

formatting package-info.json

build fix

Author: barshat7

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/models/form/package-info.java

@@ -35,9 +35,7 @@
  * </p>
  */
 
-
 @Version("5.4.1") // aligning this with release/650 since af2-rest-api is compiled with 5.2.0 in release/650
-
 package com.adobe.cq.forms.core.components.models.form;
 
 import org.osgi.annotation.versioning.Version;

ui.tests/test-module/specs/ruleeditor/ruleEditor.runtime.spec.js

@@ -141,7 +141,6 @@ describe("Rule editor submission handler runtime", () => {
             });
         }
     });
-<<<<<<< HEAD
 })
 
 describe("Rule editor save handler runtime", () => {
@@ -181,6 +180,4 @@ describe("Rule editor save handler runtime", () => {
             });
         }
     })
-=======
->>>>>>> master
 })