gavin/Chronometer
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
KevinMarquette
2017-08-05 19:52:31 -07:00
parent 82bdfb7dc7 3fdc8a02d9
commit 40e2e059df
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Chronometer/Classes/Chronometer.ps1
View File

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