kdb424/nixFlake
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix: Git mishap

Browse source
This commit is contained in:
Kyle Brown 2023-12-08 21:16:19 -08:00
parent d656d92888
commit 998779781c
1 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/networking/gluster/default.nix
View file

@ -33,26 +33,4 @@
where = "/mnt/gbackups";
}
];
<<<<<<< Updated upstream:common/networking/gluster/default.nix
=======
systemd.automounts = [
{
wantedBy = ["multi-user.target"];
where = "/mnt/gdocker";
}
{
wantedBy = ["multi-user.target"];
where = "/mnt/gmedia";
}
{
wantedBy = ["multi-user.target"];
where = "/mnt/gdockerdata";
}
{
wantedBy = ["multi-user.target"];
where = "/mnt/gbackups";
}
];
>>>>>>> Stashed changes:common/networking/gluster.nix
}