diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-10-12 20:48:35 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-10-12 20:48:35 +0000 |
commit | a0f369aa3fe9f2d223f45123db952ba7889c3c01 (patch) | |
tree | 767f82392ea61745b49a9782a9af828dc3b76a5f /src/nix/ls.cc | |
parent | f8d562c0a7cef27c65d3cff96ad8ef384f05b331 (diff) | |
parent | 20d2140e450b066a521933dd322d089fd6c248fa (diff) |
Merge remote-tracking branch 'upstream/master' into path-info
Diffstat (limited to 'src/nix/ls.cc')
-rw-r--r-- | src/nix/ls.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/ls.cc b/src/nix/ls.cc index 76c8bc9a3..baca54431 100644 --- a/src/nix/ls.cc +++ b/src/nix/ls.cc @@ -152,5 +152,5 @@ struct CmdLsNar : Command, MixLs } }; -static auto r1 = registerCommand<CmdLsStore>("ls-store"); -static auto r2 = registerCommand<CmdLsNar>("ls-nar"); +static auto rCmdLsStore = registerCommand<CmdLsStore>("ls-store"); +static auto rCmdLsNar = registerCommand<CmdLsNar>("ls-nar"); |