aboutsummaryrefslogtreecommitdiff
path: root/Recon/Recon.psd1
diff options
context:
space:
mode:
Diffstat (limited to 'Recon/Recon.psd1')
-rw-r--r--Recon/Recon.psd14
1 files changed, 4 insertions, 0 deletions
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 = ''