diff options
| author | Tw <wei.tan@intel.com> | 2021-11-30 16:46:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 09:46:48 +0100 |
| commit | d7e460a3d64e0ba0d5071ce99342b7a276993c77 (patch) | |
| tree | 255b6cbed1b8bde9d84c7d5f9d5df32490d1ccb0 | |
| parent | fix: Update CONTRIBUTING.md (#909) (diff) | |
| download | sl0ppij-d7e460a3d64e0ba0d5071ce99342b7a276993c77.tar.gz sl0ppij-d7e460a3d64e0ba0d5071ce99342b7a276993c77.tar.xz sl0ppij-d7e460a3d64e0ba0d5071ce99342b7a276993c77.zip | |
Fix: missing theme in config (#913)
Signed-off-by: Tw <wei.tan@intel.com>
| -rw-r--r-- | zellij-utils/src/input/config.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/zellij-utils/src/input/config.rs b/zellij-utils/src/input/config.rs index 4c3765a2..bc2efb86 100644 --- a/zellij-utils/src/input/config.rs +++ b/zellij-utils/src/input/config.rs @@ -155,11 +155,10 @@ impl Config { /// Merges two Config structs into one Config struct /// `other` overrides `self`. pub fn merge(&self, other: Self) -> Self { - //let themes = if let Some() Self { keybinds: self.keybinds.merge_keybinds(other.keybinds), options: self.options.merge(other.options), - themes: None, + themes: self.themes.clone(), // TODO plugins: self.plugins.merge(other.plugins), } } |