willifan/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed merge conflict

Browse source
This commit is contained in:
willifan 2024-11-14 21:37:33 +01:00
parent 1b0435b9a3
commit 8db3faafd5
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
hosts/Lillie/hardware-configuration.nix
View file

@ -1,4 +1,3 @@
<<<<<<< HEAD
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.