updated conflicts

ragavareddychalapala · ragavareddychalapala · commit c9f8a8106dbf · 2025-01-17T14:14:11.000+05:30
diff --git a/src/LCT.Common/CommonAppSettings.cs b/src/LCT.Common/CommonAppSettings.cs
@@ -229,7 +229,7 @@ public string InputFolder
             set
             {
                 if (!AppDomain.CurrentDomain.FriendlyName.Contains("SW360PackageCreator") &&
-                     !AppDomain.CurrentDomain.FriendlyName.Contains("ArtifactoryUploader"))
+                    !AppDomain.CurrentDomain.FriendlyName.Contains("ArtifactoryUploader"))
                 {
                     folderAction.ValidateFolderPath(value);
                     m_InputFolder = value;

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ public string InputFolder`
`229`	`229`	`set`
`230`	`230`	`{`
`231`	`231`	`if (!AppDomain.CurrentDomain.FriendlyName.Contains("SW360PackageCreator") &&`
`232`		`- !AppDomain.CurrentDomain.FriendlyName.Contains("ArtifactoryUploader"))`
	`232`	`+ !AppDomain.CurrentDomain.FriendlyName.Contains("ArtifactoryUploader"))`
`233`	`233`	`{`
`234`	`234`	`folderAction.ValidateFolderPath(value);`
`235`	`235`	`m_InputFolder = value;`