Sam 57c4e06080 resolved conflict		2024-05-16 20:20:05 +01:00
..
default.nix	added media	2024-05-16 20:19:01 +01:00
hardware-configuration.nix	added media	2024-05-16 20:19:01 +01:00