Fixed merge issue

JonPSmith · JonPSmith · commit 5224297d7382 · 2021-11-06T11:18:27.000Z
diff --git a/Test/UnitTests/TestDataLayer/TestPostgreSqlHelpers.cs b/Test/UnitTests/TestDataLayer/TestPostgreSqlHelpers.cs
@@ -133,10 +133,7 @@ public async Task TestEnsureCreatedAndEmptyPostgreSqlOk()
             using (var context = new BookContext(options))
             {
                 //ATTEMPT
-<<<<<<< Updated upstream
-=======
                 //logOptions.ShowLog = true;
->>>>>>> Stashed changes
                 using (new TimeThings(_output, "Time to empty database"))
                 {
                     await context.EnsureCreatedAndEmptyPostgreSqlAsync();

Original file line number	Diff line number	Diff line change
`@@ -133,10 +133,7 @@ public async Task TestEnsureCreatedAndEmptyPostgreSqlOk()`
`133`	`133`	`using (var context = new BookContext(options))`
`134`	`134`	`{`
`135`	`135`	`//ATTEMPT`
`136`		`-<<<<<<< Updated upstream`
`137`		`-=======`
`138`	`136`	`//logOptions.ShowLog = true;`
`139`		`->>>>>>> Stashed changes`
`140`	`137`	`using (new TimeThings(_output, "Time to empty database"))`
`141`	`138`	`{`
`142`	`139`	`await context.EnsureCreatedAndEmptyPostgreSqlAsync();`