fixed a merge thingy in README
This commit is contained in:
parent
013ef7d979
commit
977bfa7114
1 changed files with 0 additions and 4 deletions
|
@ -80,10 +80,6 @@ If you have a `nixos-rebuild` available on your system it can automatize these t
|
||||||
`--target-host` parameters. But there are some pitfalls so look at the `nixos-rebuild` documentation beforehand.
|
`--target-host` parameters. But there are some pitfalls so look at the `nixos-rebuild` documentation beforehand.
|
||||||
|
|
||||||
### On the machine
|
### On the machine
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> d89313e25d9c66bafdaed10bb11716589472bac3
|
|
||||||
clone this repo to `/etc/nixos/` and `nixos-rebuild boot` or `nixos-rebuild switch` that will select
|
clone this repo to `/etc/nixos/` and `nixos-rebuild boot` or `nixos-rebuild switch` that will select
|
||||||
the appropriate machine based on hostname.
|
the appropriate machine based on hostname.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue