fix: resovle conflicts

sf-kishore-kurri · sf-kishore-kurri · commit ff9191febcb5 · 2025-07-22T18:35:43.000+05:30
diff --git a/src/migration/related/OmnistudioRelatedObjectMigrationFacade.ts b/src/migration/related/OmnistudioRelatedObjectMigrationFacade.ts
@@ -124,7 +124,7 @@ export default class OmnistudioRelatedObjectMigrationFacade {
       if (relatedObjects.includes(Constants.FlexiPage)) {
         flexipageAssessmentInfos = isMigration ? this.flexipageMigration.migrate() : this.flexipageMigration.assess();
       }
-    } catch (Error) {
+    } catch (error) {
       // Log the error
       Logger.error('Error processing related objects', error);
     }

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ export default class OmnistudioRelatedObjectMigrationFacade {`
`124`	`124`	`if (relatedObjects.includes(Constants.FlexiPage)) {`
`125`	`125`	`flexipageAssessmentInfos = isMigration ? this.flexipageMigration.migrate() : this.flexipageMigration.assess();`
`126`	`126`	`}`
`127`		`- } catch (Error) {`
	`127`	`+ } catch (error) {`
`128`	`128`	`// Log the error`
`129`	`129`	`Logger.error('Error processing related objects', error);`
`130`	`130`	`}`