fix: remove leftover merge conflict marker

corylanou · claude · corylanou · commit 4843b99c93f9 · 2025-11-19T10:26:56.000-06:00
🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
diff --git a/cmd/litestream-vfs/main_test.go b/cmd/litestream-vfs/main_test.go
@@ -510,7 +510,6 @@ done:
 	if finalValue == initialValue {
 		t.Fatalf("expected updated value after commit")
 	}
->>>>>>> 95c60ce (test(vfs): add comprehensive integration and unit tests)
 }
 
 func TestVFS_HighLoadConcurrentReads(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,6 @@ done:`
`510`	`510`	`if finalValue == initialValue {`
`511`	`511`	`t.Fatalf("expected updated value after commit")`
`512`	`512`	`}`
`513`		`->>>>>>> 95c60ce (test(vfs): add comprehensive integration and unit tests)`
`514`	`513`	`}`
`515`	`514`
`516`	`515`	`func TestVFS_HighLoadConcurrentReads(t *testing.T) {`