Clean up opencode rebase and stabilize runtime test

Co-Authored-By: Paperclip <noreply@paperclip.ing>
2026-04-01 09:35:22 -05:00
parent 22af797ca3
commit 8ae4c0e765
2 changed files with 6 additions and 4 deletions
@@ -226,8 +226,6 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec
        `[paperclip] OpenCode session "${runtimeSessionId}" was saved for cwd "${runtimeSessionCwd}" and will not be resumed in "${cwd}".\n`,
      );
    }
-
-<<<<<<< HEAD
    const instructionsFilePath = asString(config.instructionsFilePath, "").trim();
    const resolvedInstructionsFilePath = instructionsFilePath
      ? path.resolve(cwd, instructionsFilePath)