Fix merge conflicts that escaped rebasing

kevin-dp · kevin-dp · commit 79db46643ba6 · 2025-12-11T12:01:59.000+01:00
diff --git a/packages/db/tests/query/indexes.test.ts b/packages/db/tests/query/indexes.test.ts
@@ -235,12 +235,8 @@ function createTestItemCollection(autoIndex: `off` | `eager` = `off`) {
       getKey: (item) => item.id,
       initialData: testData,
       autoIndex,
-<<<<<<< HEAD
-    }),
-=======
       defaultIndexType: BTreeIndex,
     })
->>>>>>> 6df29a21 (refactor(db): simplify indexing with BasicIndex and explicit defaultIndexType)
   )
 }
 

Original file line number	Diff line number	Diff line change
@@ -235,12 +235,8 @@ function createTestItemCollection(autoIndex: `off` \| `eager` = `off`) {
`235`	`235`	`getKey: (item) => item.id,`
`236`	`236`	`initialData: testData,`
`237`	`237`	`autoIndex,`
`238`		`-<<<<<<< HEAD`
`239`		`- }),`
`240`		`-=======`
`241`	`238`	`defaultIndexType: BTreeIndex,`
`242`	`239`	`})`
`243`		`->>>>>>> 6df29a21 (refactor(db): simplify indexing with BasicIndex and explicit defaultIndexType)`
`244`	`240`	`)`
`245`	`241`	`}`
`246`	`242`