diff --git a/flake.lock b/flake.lock index 043e4bc2..2aa33345 100644 --- a/flake.lock +++ b/flake.lock @@ -380,11 +380,19 @@ "vimwiki-cli": "vimwiki-cli" }, "locked": { +<<<<<<< HEAD "lastModified": 1676973620, "narHash": "sha256-BR5O6FN6xkJt44+QFbl3eixRPsFvNWiAzr05c3ARRw4=", "ref": "main", "rev": "21b4e5878555e4e8dc4a07f3a9e9656f4089e243", "revCount": 532, +======= + "lastModified": 1677160800, + "narHash": "sha256-yTswUhooOK6p+hjHxYYnp28fvPMY6WQFHSnrWtGQ6Rg=", + "ref": "main", + "rev": "20ec13d94259ca079d6b7711d0209d9308c3b8cb", + "revCount": 535, +>>>>>>> 5035552e12ac5f24ec3561e016da52682714870c "type": "git", "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" },