diff options
| author | clymb3r <bialek.joseph@gmail.com> | 2014-04-16 21:11:34 -0700 |
|---|---|---|
| committer | clymb3r <bialek.joseph@gmail.com> | 2014-04-16 21:11:34 -0700 |
| commit | f03ab1444ddb7e35c320011c1834ebfbaa13b77e (patch) | |
| tree | f7cf576c0b816b2ff2472fa4f3de1c5c9c763ee2 /Recon/Recon.psd1 | |
| parent | b783b459c12112509a733253df9f5935e104200c (diff) | |
| download | PowerSploit-f03ab1444ddb7e35c320011c1834ebfbaa13b77e.tar.gz PowerSploit-f03ab1444ddb7e35c320011c1834ebfbaa13b77e.zip | |
Fixing garbage put in by merge
Diffstat (limited to 'Recon/Recon.psd1')
| -rw-r--r-- | Recon/Recon.psd1 | 6 |
1 files changed, 0 insertions, 6 deletions
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 = ''
|