fix(tasks): remove sqlite merge marker

2026-03-30 16:19:10 +09:00 · 2026-03-30 16:19:10 +09:00 · e4e732a77b
parent e624fdcf0a
commit e4e732a77b
1 changed files with 0 additions and 1 deletions
--- a/src/tasks/task-registry.store.sqlite.ts
+++ b/src/tasks/task-registry.store.sqlite.ts
@ -186,7 +186,6 @@ function createStatements(db: DatabaseSync): TaskRegistryStatements {
      FROM task_runs
      ORDER BY created_at ASC, task_id ASC
    `),
-<<<<<<< HEAD
    selectAllDeliveryStates: db.prepare(`
      SELECT
        task_id,