From 50aa93803e52055e3342142bb50e9e38155ffaa3 Mon Sep 17 00:00:00 2001
From: Anish Lakhwara <anish+git@lakhwara.com>
Date: Mon, 23 Mar 2026 15:22:16 -0700
Subject: [PATCH] the final opencode hopefully

---
 home/profiles/opencode/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/home/profiles/opencode/default.nix b/home/profiles/opencode/default.nix
index 10fce1f..804e1a0 100644
--- a/home/profiles/opencode/default.nix
+++ b/home/profiles/opencode/default.nix
@@ -18,10 +18,6 @@ let
   # github-mcp-server binary path from nixpkgs
   githubMcpServer = "${pkgs.github-mcp-server}/bin/github-mcp-server";
 
-<<<<<<< HEAD
-  # Plugin sources fetched via flake inputs
-  handoffSrc = inputs.opencode-handoff;
-=======
   # Upstream plugin/skill sources pinned via fetchFromGitHub
   opencode-handoff-src = pkgs.fetchFromGitHub {
     owner = "Chickensoupwithrice";
@@ -65,7 +61,6 @@ let
     # Claude Code PostToolUse hook (local file, not a patch of upstream)
     cp ${./plugins/learning-opportunities-auto.js} $out/learning-opportunities-auto.js
   '';
->>>>>>> 64f30fc4d82e01dc9b381096bb4cc8cd5498c6c4
 in
 {
   home.packages = [
-- 
2.51.2