ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 4 Actions Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source 
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-04-20 18:39:22 -04:00 committed by Alice Huston
parent 4dd11b6f9a
commit 4cdef5d6a3
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
flake.lock generated
View File

@ -276,25 +276,6 @@
"type": "github" "type": "github"
} }
}, },
<<<<<<< Updated upstream
"nixos-hardware-fw16": {
"locked": {
"lastModified": 1713209644,
"narHash": "sha256-+LMAIXHprR9wPIf2DW/XfsX79tj92YzqbgMxTXDamOc=",
"ref": "add-framework-16",
"rev": "88d782d03bb4e1c09544aed82f56f4fca6fc6abc",
"revCount": 1614,
"type": "git",
"url": "https://github.com/jkoking/nixos-hardware"
},
"original": {
"ref": "add-framework-16",
"type": "git",
"url": "https://github.com/jkoking/nixos-hardware"
}
},
=======
>>>>>>> Stashed changes
"nixos-modules": { "nixos-modules": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [