one more conflict

nvarscar · nvarscar · commit c901a8305613 · 2019-12-31T10:37:57.000-08:00
diff --git a/tests/oracle/Install-DBOScript.Tests.ps1 b/tests/oracle/Install-DBOScript.Tests.ps1
@@ -425,13 +425,8 @@ Describe "Install-DBOScript Oracle integration tests" -Tag $commandName, Integra
     }
     Context "deployments with errors should throw terminating errors" {
         BeforeAll {
-            <<<<<<< HEAD
             $null = Invoke-DBOQuery @connParams -InputFile $dropObjectsScript
-            $null = Install-DBOSqlScript -ScriptPath $v1scripts @connParams -SchemaVersionTable $null
-            =======
-            $null = Invoke-DBOQuery @adminParams -Query $createUserScript
             $null = Install-DBOScript -ScriptPath $v1scripts @connParams -SchemaVersionTable $null
-            >>>>>>> a87a1a4... Renaming Install-DBOSqlScript to Install-DBOScript
         }
         AfterAll {
             $null = Invoke-DBOQuery @connParams -InputFile $dropObjectsScript

Original file line number	Diff line number	Diff line change
`@@ -425,13 +425,8 @@ Describe "Install-DBOScript Oracle integration tests" -Tag $commandName, Integra`
`425`	`425`	`}`
`426`	`426`	`Context "deployments with errors should throw terminating errors" {`
`427`	`427`	`BeforeAll {`
`428`		`- <<<<<<< HEAD`
`429`	`428`	`$null = Invoke-DBOQuery @connParams -InputFile $dropObjectsScript`
`430`		`- $null = Install-DBOSqlScript -ScriptPath $v1scripts @connParams -SchemaVersionTable $null`
`431`		`- =======`
`432`		`- $null = Invoke-DBOQuery @adminParams -Query $createUserScript`
`433`	`429`	`$null = Install-DBOScript -ScriptPath $v1scripts @connParams -SchemaVersionTable $null`
`434`		`- >>>>>>> a87a1a4... Renaming Install-DBOSqlScript to Install-DBOScript`
`435`	`430`	`}`
`436`	`431`	`AfterAll {`
`437`	`432`	`$null = Invoke-DBOQuery @connParams -InputFile $dropObjectsScript`