pagedmov/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gen 404: final cleanup on previous merge conflict

Browse Source
This commit is contained in:
pagedMov
2024-10-12 12:44:33 -04:00
parent 588249f10f
commit 2f07137baa
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock generated
View File

@@ -854,9 +854,15 @@
"pre-commit-hooks": "pre-commit-hooks_2" "pre-commit-hooks": "pre-commit-hooks_2"
}, },
"locked": { "locked": {
<<<<<<< Updated upstream
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-bjrRxs4ja1ulvgjlWN5IwfGdAVOwYQR6YSPCRVje52E=", "narHash": "sha256-bjrRxs4ja1ulvgjlWN5IwfGdAVOwYQR6YSPCRVje52E=",
"path": "./pkgs/nixvim", "path": "./pkgs/nixvim",
=======
"lastModified": 1728747549,
"narHash": "sha256-9n6nu8BS4MWpoQLyDqyGXaeJb6G9IzwQgbFjwvBdPL0=",
"path": "/home/pagedmov/sysflakes/glasshouse-desktop/home/nixvim",
>>>>>>> Stashed changes
"type": "path" "type": "path"
}, },
"original": { "original": {