diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-16 22:35:24 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-16 22:35:24 +0000 |
| commit | f60b380a7f32406659efee282cde4c1330fc1c65 (patch) | |
| tree | 8bd0680b8fafa02c93b29d0934133b0ff5b29e7a /src/libstore/globals.cc | |
| parent | c08c9f08c75bf379439348cccb5b8871a27bf498 (diff) | |
| parent | 5080d4e7b2525d1656282c65a217a22ff8381df3 (diff) | |
Merge remote-tracking branch 'upstream/master' into remove-storetype-delegate-regStore
Diffstat (limited to 'src/libstore/globals.cc')
| -rw-r--r-- | src/libstore/globals.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index 4a5971c3f..491c664db 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -162,11 +162,6 @@ template<> std::string BaseSetting<SandboxMode>::to_string() const else abort(); } -template<> nlohmann::json BaseSetting<SandboxMode>::toJSON() -{ - return AbstractSetting::toJSON(); -} - template<> void BaseSetting<SandboxMode>::convertToArg(Args & args, const std::string & category) { args.addFlag({ |