Fix merge cruft

devblackops · devblackops · commit 0b1ff6640917 · 2016-11-07T23:08:04.000-08:00
diff --git a/NetScaler/Public/New-NSLBMonitor.ps1 b/NetScaler/Public/New-NSLBMonitor.ps1
@@ -430,15 +430,12 @@ function New-NSLBMonitor {
                     if ($PSBoundParameters.ContainsKey('HTTPRequest')) {
                         $params.Add('httprequest', $HTTPRequest)
                     }
-<<<<<<< HEAD
-=======
                     if ($PSBoundParameters.ContainsKey('Send')) {
                         $params.Add('send', $Send)
                     }
                     if ($PSBoundParameters.ContainsKey('Recv')) {
                         $params.Add('recv', $Recv)
                     }
->>>>>>> dev
                     _InvokeNSRestApi -Session $Session -Method POST -Type lbmonitor -Payload $params -Action add
 
                     if ($PSBoundParameters.ContainsKey('PassThru')) {

Original file line number	Diff line number	Diff line change
`@@ -430,15 +430,12 @@ function New-NSLBMonitor {`
`430`	`430`	`if ($PSBoundParameters.ContainsKey('HTTPRequest')) {`
`431`	`431`	`$params.Add('httprequest', $HTTPRequest)`
`432`	`432`	`}`
`433`		`-<<<<<<< HEAD`
`434`		`-=======`
`435`	`433`	`if ($PSBoundParameters.ContainsKey('Send')) {`
`436`	`434`	`$params.Add('send', $Send)`
`437`	`435`	`}`
`438`	`436`	`if ($PSBoundParameters.ContainsKey('Recv')) {`
`439`	`437`	`$params.Add('recv', $Recv)`
`440`	`438`	`}`
`441`		`->>>>>>> dev`
`442`	`439`	`_InvokeNSRestApi -Session $Session -Method POST -Type lbmonitor -Payload $params -Action add`
`443`	`440`
`444`	`441`	`if ($PSBoundParameters.ContainsKey('PassThru')) {`