resolve merge conflict

2017-08-05 19:53:22 -07:00
parent 40e2e059df
commit b7c118945d
1 changed files with 0 additions and 4 deletions
--- a/Chronometer/Classes/Chronometer.ps1
+++ b/Chronometer/Classes/Chronometer.ps1
@@ -25,11 +25,7 @@ class Chronometer

                $breakpointParam = @{
                    Script = $file
-<<<<<<< HEAD
                    Line   = $bpLine
-=======
-                    Line = $bpLine
->>>>>>> master
                    Action = { [ScriptProfiler]::RecordExecution( $_) }
                }
                $this.breakPoint += Set-PSBreakpoint @breakpointParam