diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-10-09 18:26:47 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-10-09 18:26:47 +0000 |
| commit | 39de73550dd5579c2b3f14f7ce669d3f8ed85689 (patch) | |
| tree | 79194a4ed21a04ebca269005d2e188532e460fab /src/nix/show-config.cc | |
| parent | cfe791a638a3fdf53a2608f885c407bafc238094 (diff) | |
| parent | e845d19ae368cb9ee6371c4b2fdbdc86a110d893 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-and-ci-static-builds
Diffstat (limited to 'src/nix/show-config.cc')
| -rw-r--r-- | src/nix/show-config.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nix/show-config.cc b/src/nix/show-config.cc index 328cd2ff2..91721219b 100644 --- a/src/nix/show-config.cc +++ b/src/nix/show-config.cc @@ -30,4 +30,4 @@ struct CmdShowConfig : Command, MixJSON } }; -static auto r1 = registerCommand<CmdShowConfig>("show-config"); +static auto rShowConfig = registerCommand<CmdShowConfig>("show-config"); |