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

trying to resolve merge conflict with new plugin

Browse Source
This commit is contained in:
pagedMov
2024-10-12 11:57:41 -04:00
parent 6d5f7e71e1
commit df75f0bb24
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
flake.lock generated
View File

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