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.lock | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'flake.lock')

diff --git a/flake.lock b/flake.lock
index f16f16a5..2ce9fb11 100644
--- a/flake.lock
+++ b/flake.lock
@@ -321,11 +321,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692260837,
-        "narHash": "sha256-2FpkX1zl+7ni7djK7NeE1ZGupRUwZgjW+RPCSBgDf4k=",
+        "lastModified": 1692448348,
+        "narHash": "sha256-/Wy9Bzw59A5OD82S9dWHshg+wiSzJNh95hPXNhO5K7E=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6a94c1a59737783c282c4031555a289c28b961e4",
+        "rev": "bdb5bcad01ff7332fdcf4b128211e81905113f84",
         "type": "github"
       },
       "original": {
@@ -363,7 +363,7 @@
           "flake-utils"
         ],
         "nixpkgs": [
-          "nixpkgs_stable_release"
+          "nixpkgs-stable"
         ],
         "pre-commit-hooks-nix": [
           "pre-commit-hooks"
@@ -578,7 +578,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_stable_release": {
+    "nixpkgs-stable": {
       "locked": {
         "lastModified": 1692339729,
         "narHash": "sha256-TUK76/Pqm9qIDjEGd27Lz9EiBIvn5F70JWDmEQ4Y5DQ=",
@@ -665,7 +665,7 @@
           "nixpkgs"
         ],
         "nixpkgs-stable": [
-          "nixpkgs_stable_release"
+          "nixpkgs-stable"
         ]
       },
       "locked": {
@@ -768,7 +768,7 @@
         "nixVim": "nixVim",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs",
-        "nixpkgs_stable_release": "nixpkgs_stable_release",
+        "nixpkgs-stable": "nixpkgs-stable",
         "poetry2nix": "poetry2nix",
         "pre-commit-hooks": "pre-commit-hooks",
         "ragenix": "ragenix",
-- 
cgit 1.4.1