cadey
/
nixos-configs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove merge conflict 

Signed-off-by: Xe <me@christine.website>
This commit is contained in:
Cadey Ratio 2022-05-14 19:49:59 +00:00
parent 3d8575c181
commit aeb8af0e88
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hosts/kos-mos/default.nix
View File

@ -9,8 +9,6 @@
networking.hostName = "kos-mos"; networking.hostName = "kos-mos";
networking.hostId = "472479d4"; networking.hostId = "472479d4";
<<<<<<< HEAD
=======
xeserv.services.robocadey.enable = true; xeserv.services.robocadey.enable = true;
age.secrets.robocadey = { age.secrets.robocadey = {
@ -18,5 +16,4 @@
path = "/var/lib/private/xeserv.robocadey/.env"; path = "/var/lib/private/xeserv.robocadey/.env";
mode = "0666"; mode = "0666";
}; };
>>>>>>> 8c3057c (fix???)
} }