summaryrefslogtreecommitdiff
path: root/machines/khad/hardware-configuration.nix
diff options
context:
space:
mode:
authorDevin Finlinson <devin.finlinson@pm.me>2023-10-31 22:23:58 -0600
committerDevin Finlinson <devin.finlinson@pm.me>2023-10-31 22:23:58 -0600
commit4b53fe5ff170c0f8670bf3d542ece665eec60893 (patch)
tree750d37ded84013fab56c0cc5a5eef235b9413ac7 /machines/khad/hardware-configuration.nix
parentd94ed7d8188d1390ba8986a3411479a36b9b5691 (diff)
parentaab187548391515abd7383ba75a44bd951b6d31f (diff)
Resolved merge conflict.
Diffstat (limited to 'machines/khad/hardware-configuration.nix')
0 files changed, 0 insertions, 0 deletions