resolve merge conflict

2017-08-05 19:52:31 -07:00
parent 82bdfb7dc7 3fdc8a02d9
commit 40e2e059df
1 changed files with 4 additions and 0 deletions
--- a/Chronometer/Classes/Chronometer.ps1
+++ b/Chronometer/Classes/Chronometer.ps1
@@ -25,7 +25,11 @@ class Chronometer

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