wtfstuff
This commit is contained in:
parent
2ca763bfde
commit
576e539bc5
3 changed files with 11 additions and 2 deletions
8
flake.lock
generated
8
flake.lock
generated
|
@ -24,13 +24,19 @@
|
|||
"mac-brcm-fw": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
<<<<<<< HEAD
|
||||
"lastModified": 1664744853,
|
||||
"narHash": "sha256-i5EFVTIDHQCtFg/OFLmjOzbJqhpwy4MjwBmFUnq0DjI=",
|
||||
"path": "/home/jade/mac-brcm-fw",
|
||||
=======
|
||||
"lastModified": 1,
|
||||
"narHash": "sha256-ewzM8IBKNFCx73ah5rflcdx605ukRF3oTWwih2CTsvs=",
|
||||
"path": "./mac-brcm-fw",
|
||||
>>>>>>> 801cd65 (stuff)
|
||||
"type": "path"
|
||||
},
|
||||
"original": {
|
||||
"path": "../mac-brcm-fw",
|
||||
"path": "./mac-brcm-fw",
|
||||
"type": "path"
|
||||
}
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue