From c5736e5963ae86d3ee813da3edb3d56283b08a6a Mon Sep 17 00:00:00 2001 From: adikro Date: Sun, 25 Jan 2026 22:44:59 +0100 Subject: merge conflict --- flake.lock | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/flake.lock b/flake.lock index 4a8f9bf..91c2be7 100644 --- a/flake.lock +++ b/flake.lock @@ -161,7 +161,31 @@ "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=", "owner": "nix-community", "repo": "home-manager", +<<<<<<< Updated upstream "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b", +======= + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767901774, + "narHash": "sha256-Zf21x7yWdFI2lwNRcO76FjoKlB2sRCxNTW97ekeftvo=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "37158e52675b77da7d2eab3579011659eaedde1d", +>>>>>>> Stashed changes "type": "github" }, "original": { -- cgit v1.3