From 665be3f4eb3f3932f73af1941c275406f1235fbe Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Sat, 19 Aug 2023 17:38:25 +0200
Subject: Fix(flake): Remove Merge conflicts

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index f875c033..6be4609d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,7 +37,7 @@
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
         flake-compat.follows = "flake-compat";
-        nixpkgs-stable.follows = "nixpkgs_stable_release";
+        nixpkgs-stable.follows = "nixpkgs-stable";
         gitignore.follows = "gitignore";
       };
     };
-- 
cgit 1.4.1