From f03ab1444ddb7e35c320011c1834ebfbaa13b77e Mon Sep 17 00:00:00 2001
From: clymb3r <bialek.joseph@gmail.com>
Date: Wed, 16 Apr 2014 21:11:34 -0700
Subject: Fixing garbage put in by merge

---
 Recon/Get-ComputerDetails.ps1 | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'Recon/Get-ComputerDetails.ps1')

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
     )
-- 
cgit v1.2.3