From: Michael Shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 10 Oct 2022 06:24:36 +0000 (-0700) Subject: Fix merge conflict X-Git-Tag: v1.10.0-beta.rc1~1^2~77^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1641%2Fhead;p=thirdparty%2Fpaperless-ngx.git Fix merge conflict --- diff --git a/src-ui/src/app/components/manage/settings/settings.component.ts b/src-ui/src/app/components/manage/settings/settings.component.ts index e033bdc6ab..7a1f318208 100644 --- a/src-ui/src/app/components/manage/settings/settings.component.ts +++ b/src-ui/src/app/components/manage/settings/settings.component.ts @@ -112,6 +112,7 @@ export class SettingsComponent documentListItemPerPage: this.settings.get( SETTINGS_KEYS.DOCUMENT_LIST_SIZE ), + slimSidebarEnabled: this.settings.get(SETTINGS_KEYS.SLIM_SIDEBAR), darkModeUseSystem: this.settings.get(SETTINGS_KEYS.DARK_MODE_USE_SYSTEM), darkModeEnabled: this.settings.get(SETTINGS_KEYS.DARK_MODE_ENABLED), darkModeInvertThumbs: this.settings.get(