Merge branch 'master' of https://github.com/mattifestation/PowerSploit

Conflicts:
	Recon/Get-ComputerDetails.ps1
	Recon/Recon.psd1

3 files changed, 4 insertions, 4 deletions

diff --git a/AntivirusBypass/AntivirusBypass.psd1 b/AntivirusBypass/AntivirusBypass.psd1
index ab2918b..29949c1 100644
--- a/AntivirusBypass/AntivirusBypass.psd1
+++ b/AntivirusBypass/AntivirusBypass.psd1
@@ -1,4 +1,4 @@
-@{

+@{

 

 # Script module or binary module file associated with this manifest.

 ModuleToProcess = 'AntivirusBypass.psm1'

@@ -84,4 +84,4 @@ FileList = 'AntivirusBypass.psm1', 'AntivirusBypass.psd1', 'Find-AVSignature.ps1
 # Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.

 # DefaultCommandPrefix = ''

 

-}
\ No newline at end of file
+}

diff --git a/AntivirusBypass/AntivirusBypass.psm1 b/AntivirusBypass/AntivirusBypass.psm1
index e5234fb..81d3818 100644
--- a/AntivirusBypass/AntivirusBypass.psm1
+++ b/AntivirusBypass/AntivirusBypass.psm1
@@ -1 +1 @@
-Get-ChildItem (Join-Path $PSScriptRoot *.ps1) | % { . $_.FullName}
\ No newline at end of file
+Get-ChildItem (Join-Path $PSScriptRoot *.ps1) | % { . $_.FullName}
diff --git a/AntivirusBypass/Find-AVSignature.ps1 b/AntivirusBypass/Find-AVSignature.ps1
index 80e2b1f..d2487b3 100644
--- a/AntivirusBypass/Find-AVSignature.ps1
+++ b/AntivirusBypass/Find-AVSignature.ps1
@@ -183,4 +183,4 @@ http://heapoverflow.com/f0rums/project.php?issueid=34&filter=changes&page=2
 		#During testing using large binaries, memory usage was excessive so lets fix that
         [System.GC]::Collect()
         Write-Verbose "Completed!"
-}
\ No newline at end of file
+}