mirror of
https://github.com/ellmau/nixos.git
synced 2025-12-19 09:29:36 +01:00
flake lock upd
This commit is contained in:
parent
d95e07f637
commit
65ef5f8ffc
8
flake.lock
generated
8
flake.lock
generated
@ -2,19 +2,11 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"emacs-overlay": {
|
"emacs-overlay": {
|
||||||
"locked": {
|
"locked": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"lastModified": 1642044102,
|
|
||||||
"narHash": "sha256-GjDR4EmJw+OUCapU8Lx4VqKsycfr9Kd1gbeHL32q0jM=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "emacs-overlay",
|
|
||||||
"rev": "7b47359a8007a77b36c8bc2484930f988333f3ce",
|
|
||||||
=======
|
|
||||||
"lastModified": 1642414078,
|
"lastModified": 1642414078,
|
||||||
"narHash": "sha256-izmKOQGC3nttxqnpgJZo6IoR/ZNto9u12ToFRdEwL4Y=",
|
"narHash": "sha256-izmKOQGC3nttxqnpgJZo6IoR/ZNto9u12ToFRdEwL4Y=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "emacs-overlay",
|
"repo": "emacs-overlay",
|
||||||
"rev": "cda8c68fe3dabd1cfd8b9621564d3088d0bcb071",
|
"rev": "cda8c68fe3dabd1cfd8b9621564d3088d0bcb071",
|
||||||
>>>>>>> edea0b8 (FLAKE upd)
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user