aboutsummaryrefslogtreecommitdiff
path: root/Recon/Get-ComputerDetails.ps1
diff options
context:
space:
mode:
authorclymb3r <bialek.joseph@gmail.com>2014-04-16 21:11:34 -0700
committerclymb3r <bialek.joseph@gmail.com>2014-04-16 21:11:34 -0700
commitf03ab1444ddb7e35c320011c1834ebfbaa13b77e (patch)
treef7cf576c0b816b2ff2472fa4f3de1c5c9c763ee2 /Recon/Get-ComputerDetails.ps1
parentb783b459c12112509a733253df9f5935e104200c (diff)
downloadPowerSploit-f03ab1444ddb7e35c320011c1834ebfbaa13b77e.tar.gz
PowerSploit-f03ab1444ddb7e35c320011c1834ebfbaa13b77e.zip
Fixing garbage put in by merge
Diffstat (limited to 'Recon/Get-ComputerDetails.ps1')
-rw-r--r--Recon/Get-ComputerDetails.ps111
1 files changed, 0 insertions, 11 deletions
diff --git a/Recon/Get-ComputerDetails.ps1 b/Recon/Get-ComputerDetails.ps1
index 88a6216..349f4a3 100644
--- a/Recon/Get-ComputerDetails.ps1
+++ b/Recon/Get-ComputerDetails.ps1
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
function Get-ComputerDetails
-=======
-function Get-ComputerDetails
->>>>>>> 946328cf9e6d6c60eca2bb9d71a38e210c1c3b6c
{
<#
.SYNOPSIS
@@ -223,11 +219,8 @@ Github repo: https://github.com/clymb3r/PowerShell
}
-<<<<<<< HEAD
-=======
function Find-4624Logons
{
->>>>>>> 946328cf9e6d6c60eca2bb9d71a38e210c1c3b6c
<#
.SYNOPSIS
@@ -257,12 +250,8 @@ Find unique 4624 logon events.
Blog: http://clymb3r.wordpress.com/
Github repo: https://github.com/clymb3r/PowerShell
#>
-<<<<<<< HEAD
function Find-4624Logons
{
-=======
-
->>>>>>> 946328cf9e6d6c60eca2bb9d71a38e210c1c3b6c
Param (
$SecurityLog
)