mirror of
https://github.com/NixOS/nix.git
synced 2025-11-22 10:19:36 +01:00
Merge remote-tracking branch 'upstream/master' into path-info
This commit is contained in:
commit
a0f369aa3f
127 changed files with 650 additions and 549 deletions
|
|
@ -334,6 +334,6 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
static RegisterStoreImplementation<LegacySSHStore, LegacySSHStoreConfig> regStore;
|
||||
static RegisterStoreImplementation<LegacySSHStore, LegacySSHStoreConfig> regLegacySSHStore;
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue