Merge branch 'master' of https://github.com/mattifestation/PowerSploit

Conflicts:
	Recon/Get-ComputerDetails.ps1
	Recon/Recon.psd1

1 files changed, 7 insertions, 3 deletions

diff --git a/Recon/Recon.psd1 b/Recon/Recon.psd1
index 50b6fc6..5a776eb 100644
--- a/Recon/Recon.psd1
+++ b/Recon/Recon.psd1
@@ -1,4 +1,4 @@
-@{

+@{

 

 # Script module or binary module file associated with this manifest.

 ModuleToProcess = 'Recon.psm1'

@@ -72,9 +72,13 @@ AliasesToExport = ''
 # List of all modules packaged with this module.

 ModuleList = @(@{ModuleName = 'Recon'; ModuleVersion = '1.0.0.0'; GUID = '7e775ad6-cd3d-4a93-b788-da067274c877'})

 

-# List of all files packaged with this module
+# 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 = ''

@@ -85,4 +89,4 @@ FileList = 'Recon.psm1', 'Recon.psd1', 'Get-HttpStatus.ps1', 'Invoke-ReverseDnsL
 # Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.

 # DefaultCommandPrefix = ''

 

-}
\ No newline at end of file
+}