Fix merged conflict that caused test failures

Author: Quoc Truong

Tests/Engine/LibraryUsage.tests.ps1

@@ -36,30 +36,22 @@ function Invoke-ScriptAnalyzer {
 		[switch] $Recurse,
 
         [Parameter(Mandatory = $false)]
-<<<<<<< Updated upstream
 		[switch] $IncludeDefaultRules,
 
         [Parameter(Mandatory = $false)]
-        [switch] $SuppressedOnly,
-
-		[Parameter(Mandatory = $false)]       
-        [string] $Profile = $null
+        [switch] $SuppressedOnly
 	)	
 
     if ($null -eq $CustomRulePath)
     {
         $IncludeDefaultRules = $true
     }
-=======
-        [switch] $SuppressedOnly
-	)
 	# There is an inconsistency between this implementation and c# implementation of the cmdlet. 
 	# The CustomRulePath parameter here is of "string[]" type whereas in the c# implementation it is of "string" type.
 	# If we set the CustomRulePath parameter here to  "string[]", then the library usage test fails when run as an administrator. 
 	# We want to note that the library usage test doesn't fail when run as a non-admin user.
 	# The following is the error statement when the test runs as an administrator. 
 	# Assert failed on "Initialize" with "7" argument(s): "Test failed due to terminating error: The module was expected to contain an assembly manifest. (Exception from HRESULT: 0x80131018)"
->>>>>>> Stashed changes
 
 	$scriptAnalyzer = New-Object "Microsoft.Windows.PowerShell.ScriptAnalyzer.ScriptAnalyzer";
 	$scriptAnalyzer.Initialize(
@@ -69,13 +61,8 @@ function Invoke-ScriptAnalyzer {
 		$IncludeRule,
 		$ExcludeRule,
 		$Severity,
-<<<<<<< Updated upstream
         $IncludeDefaultRules.IsPresent,
-		$SuppressedOnly.IsPresent,
-		$Profile
-=======
 		$SuppressedOnly.IsPresent
->>>>>>> Stashed changes
 	);
 
     if ($PSCmdlet.ParameterSetName -eq "File") {