From f480431a61afdea86c5fc6ce0f7fe53a30cb0d4b Mon Sep 17 00:00:00 2001
From: kalipso <kalipso@c3d2.de>
Date: Tue, 3 Dec 2024 00:14:13 +0100
Subject: [PATCH] [nixpkgs] 24.05 -> 24.11

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

diff --git a/flake.lock b/flake.lock
index 7b28974..ad79d25 100644
--- a/flake.lock
+++ b/flake.lock
@@ -109,6 +109,7 @@
         "spectrum": "spectrum"
       },
       "locked": {
+<<<<<<< HEAD
 <<<<<<< HEAD
         "lastModified": 1733003272,
         "narHash": "sha256-ratU5qCcRuOojgPWM90gda4qrxukNqbyFi+kan2Ln04=",
@@ -122,6 +123,13 @@
         "repo": "microvm.nix",
         "rev": "e08aed6e3a32e47e21e57bd2791326ea3f7647be",
 >>>>>>> 72ab98e ([nixpkgs] update microvm)
+=======
+        "lastModified": 1733003272,
+        "narHash": "sha256-ratU5qCcRuOojgPWM90gda4qrxukNqbyFi+kan2Ln04=",
+        "owner": "astro",
+        "repo": "microvm.nix",
+        "rev": "e8d5f12b834a59187c7ec147a8952a0567f97939",
+>>>>>>> fa36b06 ([nixpkgs] 24.05 -> 24.11)
         "type": "github"
       },
       "original": {