From 7a495909b984243c730c5d9639943729df86d907 Mon Sep 17 00:00:00 2001
From: harry <harryh@ik.me>
Date: Thu, 26 Dec 2024 14:47:08 +0100
Subject: [PATCH] fixed conflicts

---
 flake.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8a496f6..a2b340c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -416,16 +416,16 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1734875076,
-        "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=",
+        "lastModified": 1734927162,
+        "narHash": "sha256-egJAEOe61A3FFU1KkG7GW51Q9uq39L4yfkrGfA2p2Eo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1807c2b91223227ad5599d7067a61665c52d1295",
+        "rev": "d28f9301c35e66751872254b8029f31fa9e0da20",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-24.11-small",
         "repo": "nixpkgs",
         "type": "github"
       }