From ede8ed3f44e9025ee2e5732d0dfe64351ade23ec Mon Sep 17 00:00:00 2001
From: Geometer1729 <16kuhnb@gmail.com>
Date: Thu, 16 Jan 2025 09:18:24 -0500
Subject: [PATCH] resolve merge conflict from flake.lock

---
 flake.lock | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1b9badac6..594365fbc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -265,13 +265,8 @@
         "utils": "utils"
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1736435446,
-        "narHash": "sha256-3e82deloDgZaV7hB8P6NfMEavRyrH/pB/E7AqWbxOs8=",
-=======
         "lastModified": 1736265310,
         "narHash": "sha256-4LLy5VMM5TK4LpQXEBiA8ziwYyqGx2ZAuunXGCDpraQ=",
->>>>>>> main
         "path": "src/mina",
         "type": "path"
       },