From 7290bdad3b07e75e7eaa1a1772618d08ecf80db8 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Sat, 12 Aug 2023 19:01:41 -0700 Subject: [PATCH] fix: merge conflight in lockfile --- flake.lock | 8 -------- 1 file changed, 8 deletions(-) diff --git a/flake.lock b/flake.lock index 2d33d2c9..dbbb120b 100644 --- a/flake.lock +++ b/flake.lock @@ -487,19 +487,11 @@ ] }, "locked": { -<<<<<<< HEAD "lastModified": 1691215224, "narHash": "sha256-sajUJsMFxIVUiDUxbRdukGy650lDLmUQG6FUOuzLs+A=", "ref": "main", "rev": "cb1c91802c74065cf9b8ecb35e14fb75d896bc39", "revCount": 943, -======= - "lastModified": 1691809207, - "narHash": "sha256-Ml3w6o96E66OgEv5+z6OCtLLAQylvcOTX2t/D+jPSFs=", - "ref": "main", - "rev": "31089236697319f4be5c50e16add3154235c7c3c", - "revCount": 963, ->>>>>>> b42ede3a30e7ccb72da99ba39f1c81833775d576 "type": "git", "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" },