From 4347bf733c322fc24120ce2f4759bfa5d5c27f5a Mon Sep 17 00:00:00 2001
From: William P <me@williamtpeebles.com>
Date: Fri, 6 Mar 2026 20:32:37 -0500
Subject: [PATCH] fix flake.nix

---
 flake.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8463ee5..f15805a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,11 +46,8 @@
                         .venv/bin/pip install -r ./app/requirements.txt
                         source .venv/bin/activate
                     fi
-<<<<<<< HEAD
-=======
 
                     export YTDLP_BIN=${pkgs.lib.getExe pkgs.yt-dlp}
->>>>>>> v1-refactor
                 '';
             };
         });