From d6d329ab19f97a4e6d9bc7f3693255141b2ee958 Mon Sep 17 00:00:00 2001
From: querolita <anais.querol@gmail.com>
Date: Fri, 13 Dec 2024 16:39:25 +0100
Subject: [PATCH] fix flake.lock

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

diff --git a/flake.lock b/flake.lock
index a23c54099..a84b640df 100644
--- a/flake.lock
+++ b/flake.lock
@@ -265,13 +265,8 @@
         "utils": "utils"
       },
       "locked": {
-<<<<<<< HEAD
         "lastModified": 1733764024,
         "narHash": "sha256-3e82deloDgZaV7hB8P6NfMEavRyrH/pB/E7AqWbxOs8=",
-=======
-        "lastModified": 1733429866,
-        "narHash": "sha256-/ZEGYdZ2hLjBwdEzG/BIjlDehOjuGWmBqzD55nXfZoY=",
->>>>>>> main
         "path": "src/mina",
         "type": "path"
       },