pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

flake: fix leftover merge conflict

Browse source
This commit is contained in:
teutat3s 2023-07-02 13:27:04 +02:00
parent 38ebdcf0dc
commit 91a89f172d
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -54,12 +54,9 @@
nixos-hardware, nixos-hardware,
agenix, agenix,
deploy, deploy,
<<<<<<< HEAD nvfetcher,
triton-vmtools, triton-vmtools,
keycloak-theme-pub-solar, keycloak-theme-pub-solar,
=======
nvfetcher,
>>>>>>> main
... ...
} @ inputs: } @ inputs:
digga.lib.mkFlake digga.lib.mkFlake