Remove conflict marker

otoolep · otoolep · commit abfec4480e74 · 2025-04-18T22:44:16.000-04:00
diff --git a/sqlite3_test.go b/sqlite3_test.go
@@ -1865,7 +1865,6 @@ func TestSetFileControlInt(t *testing.T) {
 	})
 }
 
-<<<<<<< HEAD
 func TestDBConfigNoCkptOnClose(t *testing.T) {
 	fname := TempFilename(t)
 	defer os.Remove(fname)

Original file line number	Diff line number	Diff line change
`@@ -1865,7 +1865,6 @@ func TestSetFileControlInt(t *testing.T) {`
`1865`	`1865`	`})`
`1866`	`1866`	`}`
`1867`	`1867`
`1868`		`-<<<<<<< HEAD`
`1869`	`1868`	`func TestDBConfigNoCkptOnClose(t *testing.T) {`
`1870`	`1869`	`fname := TempFilename(t)`
`1871`	`1870`	`defer os.Remove(fname)`