Fix bad merge
This commit is contained in:
parent
107db4a325
commit
a8b3f92fab
1 changed files with 1 additions and 4 deletions
|
|
@ -6,11 +6,8 @@
|
|||
|
||||
boot.tmp.cleanOnBoot = true;
|
||||
environment.systemPackages = map lib.lowPrio [
|
||||
<<<<<<< HEAD
|
||||
pkgs.cloud-init
|
||||
=======
|
||||
pkgs.binutils
|
||||
>>>>>>> 3563d6b (Add binutils to all servers)
|
||||
pkgs.cloud-init
|
||||
pkgs.curl
|
||||
pkgs.dig
|
||||
pkgs.htop
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue