From f03ab1444ddb7e35c320011c1834ebfbaa13b77e Mon Sep 17 00:00:00 2001 From: clymb3r Date: Wed, 16 Apr 2014 21:11:34 -0700 Subject: Fixing garbage put in by merge --- Recon/Get-ComputerDetails.ps1 | 11 ----------- Recon/Recon.psd1 | 6 ------ 2 files changed, 17 deletions(-) (limited to 'Recon') 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 ) diff --git a/Recon/Recon.psd1 b/Recon/Recon.psd1 index 5a776eb..d22c8d5 100644 --- a/Recon/Recon.psd1 +++ b/Recon/Recon.psd1 @@ -74,12 +74,6 @@ 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 = '' -- cgit v1.2.3