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

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

6 files changed, 10 insertions, 10 deletions

diff --git a/CodeExecution/CodeExecution.psd1 b/CodeExecution/CodeExecution.psd1
index 394c7de..07963fc 100644
--- a/CodeExecution/CodeExecution.psd1
+++ b/CodeExecution/CodeExecution.psd1
@@ -1,4 +1,4 @@
-@{
+@{
 
 # Script module or binary module file associated with this manifest.
 ModuleToProcess = 'CodeExecution.psm1'
@@ -85,4 +85,4 @@ FileList = 'CodeExecution.psm1', 'CodeExecution.psd1', 'Invoke-Shellcode.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/CodeExecution/CodeExecution.psm1 b/CodeExecution/CodeExecution.psm1
index e5234fb..81d3818 100644
--- a/CodeExecution/CodeExecution.psm1
+++ b/CodeExecution/CodeExecution.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/CodeExecution/Invoke-DllInjection.ps1 b/CodeExecution/Invoke-DllInjection.ps1
index 572a911..8395ab8 100644
--- a/CodeExecution/Invoke-DllInjection.ps1
+++ b/CodeExecution/Invoke-DllInjection.ps1
@@ -325,4 +325,4 @@ http://www.exploit-monday.com
     }

 

     Write-Verbose "Injected DLL information:$($DllInfo)"

-}
\ No newline at end of file
+}

diff --git a/CodeExecution/Invoke-ReflectivePEInjection.ps1 b/CodeExecution/Invoke-ReflectivePEInjection.ps1
index ccc1dd6..599212b 100644
--- a/CodeExecution/Invoke-ReflectivePEInjection.ps1
+++ b/CodeExecution/Invoke-ReflectivePEInjection.ps1
@@ -2840,4 +2840,4 @@ Function Main
 }
 
 Main
-}
\ No newline at end of file
+}
diff --git a/CodeExecution/Invoke-ShellcodeMSIL.ps1 b/CodeExecution/Invoke-ShellcodeMSIL.ps1
index 4123d06..158a643 100644
--- a/CodeExecution/Invoke-ShellcodeMSIL.ps1
+++ b/CodeExecution/Invoke-ShellcodeMSIL.ps1
@@ -1,4 +1,4 @@
-function Invoke-ShellcodeMSIL
+function Invoke-ShellcodeMSIL
 {
 <#
 .SYNOPSIS
@@ -264,4 +264,4 @@
     {
         Write-Verbose 'Shellcode executed successfully!'
     }
-}
\ No newline at end of file
+}
diff --git a/CodeExecution/Watch-BlueScreen.ps1 b/CodeExecution/Watch-BlueScreen.ps1
index 2fa317e..0a12a91 100644
--- a/CodeExecution/Watch-BlueScreen.ps1
+++ b/CodeExecution/Watch-BlueScreen.ps1
@@ -1,4 +1,4 @@
-function Watch-BlueScreen
+function Watch-BlueScreen
 {
 <#
 .SYNOPSIS
@@ -15,7 +15,7 @@
 .NOTES
 
     Tavis Ormandy documented this technique on 2/3/2013 and Nikita Tarakanov
-    ‏tweeted this technique on 5/13/2013.
+    ?tweeted this technique on 5/13/2013.
 
 .LINK
 
@@ -75,4 +75,4 @@
         $Gdi32::SetLayout($DC, $LAYOUT_RTL) | Out-Null
         $Gdi32::ScaleWindowExtEx($DC, [Int32]::MinValue, -1, 1, 1, [IntPtr]::Zero) | Out-Null
     }
-}
\ No newline at end of file
+}