diff options
Diffstat (limited to 'Recon')
| -rw-r--r-- | Recon/Get-ComputerDetails.ps1 | 12 | ||||
| -rw-r--r-- | Recon/Recon.psd1 | 4 |
2 files changed, 16 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 ) diff --git a/Recon/Recon.psd1 b/Recon/Recon.psd1 index f30ff2e..5a776eb 100644 --- a/Recon/Recon.psd1 +++ b/Recon/Recon.psd1 @@ -74,7 +74,11 @@ ModuleList = @(@{ModuleName = 'Recon'; ModuleVersion = '1.0.0.0'; GUID = '7e775a # List of all files packaged with this module
FileList = 'Recon.psm1', 'Recon.psd1', 'Get-HttpStatus.ps1', 'Invoke-ReverseDnsLookup.ps1',
+<<<<<<< HEAD + 'Invoke-Portscan.ps1', 'Get-ComputerDetails', 'Usage.md' +======= 'Invoke-Portscan.ps1', 'Get-ComputerDetails.ps1', 'Usage.md'
+>>>>>>> 946328cf9e6d6c60eca2bb9d71a38e210c1c3b6c # Private data to pass to the module specified in RootModule/ModuleToProcess
# PrivateData = ''
|