remove merge artifact
This commit is contained in:
parent
677be38526
commit
403b22d8e0
1 changed files with 2 additions and 3 deletions
5
clan.nix
5
clan.nix
|
|
@ -51,7 +51,7 @@
|
|||
|
||||
roles.controller.machines."m1" = {};
|
||||
};
|
||||
|
||||
|
||||
k3s = {
|
||||
module = {
|
||||
name = "@amarth/k3s";
|
||||
|
|
@ -59,10 +59,9 @@
|
|||
};
|
||||
|
||||
roles.server.machines."c1" = {};
|
||||
|
||||
|
||||
roles.agent.machines."c2" = {};
|
||||
roles.agent.machines."c3" = {};
|
||||
>>>>>>> 81bc14dcb9b649451939a01d3828ca4c170dc897
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue