diff options
author | ene <ene@sils.li> | 2023-01-21 07:41:32 +0100 |
---|---|---|
committer | ene <ene@sils.li> | 2023-01-21 07:41:32 +0100 |
commit | cf63e4141cf072b7b942bff23e023890e767a3b1 (patch) | |
tree | 7eeafef988fd8c3f541369526b6711e082085a48 /users.nix | |
parent | Merge branch 'server1' into server1_users (diff) | |
download | nixos-server-cf63e4141cf072b7b942bff23e023890e767a3b1.tar.gz nixos-server-cf63e4141cf072b7b942bff23e023890e767a3b1.zip |
Fix: Resolve merge conflicts
Diffstat (limited to 'users.nix')
0 files changed, 0 insertions, 0 deletions