diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-22 16:22:00 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-01-22 16:22:00 +0000 |
| commit | 5738b08233022b8cb74b1550ac0fe9d620ff52cd (patch) | |
| tree | 886f1ee22f92a240f235df1eecfdad8e505f4d15 /src/libstore/remote-store.hh | |
| parent | bd96403da6a1181e46a52be7befade0c00f9e743 (diff) | |
| parent | b7bfc7ee52dd425e0156f369eb4c05a62358f912 (diff) | |
Merge remote-tracking branch 'upstream/master' into trustless-remote-builder-simple
Diffstat (limited to 'src/libstore/remote-store.hh')
| -rw-r--r-- | src/libstore/remote-store.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh index fdd53e6ed..b3a9910a3 100644 --- a/src/libstore/remote-store.hh +++ b/src/libstore/remote-store.hh @@ -29,7 +29,7 @@ struct RemoteStoreConfig : virtual StoreConfig /* FIXME: RemoteStore is a misnomer - should be something like DaemonStore. */ -class RemoteStore : public virtual Store, public virtual RemoteStoreConfig +class RemoteStore : public virtual RemoteStoreConfig, public virtual Store { public: |