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/Recon.psd1 | 6 ------ 1 file changed, 6 deletions(-) (limited to 'Recon/Recon.psd1') 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