aboutsummaryrefslogtreecommitdiff
path: root/Recon/Get-ComputerDetails.ps1
diff options
context:
space:
mode:
Diffstat (limited to 'Recon/Get-ComputerDetails.ps1')
-rw-r--r--Recon/Get-ComputerDetails.ps112
1 files changed, 12 insertions, 0 deletions
diff --git a/Recon/Get-ComputerDetails.ps1 b/Recon/Get-ComputerDetails.ps1
index d40e88f..88a6216 100644
--- a/Recon/Get-ComputerDetails.ps1
+++ b/Recon/Get-ComputerDetails.ps1
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
+function Get-ComputerDetails
+=======
function Get-ComputerDetails
+>>>>>>> 946328cf9e6d6c60eca2bb9d71a38e210c1c3b6c
{
<#
.SYNOPSIS
@@ -219,8 +223,11 @@ Github repo: https://github.com/clymb3r/PowerShell
}
+<<<<<<< HEAD
+=======
function Find-4624Logons
{
+>>>>>>> 946328cf9e6d6c60eca2bb9d71a38e210c1c3b6c
<#
.SYNOPSIS
@@ -250,7 +257,12 @@ Find unique 4624 logon events.
Blog: http://clymb3r.wordpress.com/
Github repo: https://github.com/clymb3r/PowerShell
#>
+<<<<<<< HEAD
+function Find-4624Logons
+{
+=======
+>>>>>>> 946328cf9e6d6c60eca2bb9d71a38e210c1c3b6c
Param (
$SecurityLog
)