diff options
| author | Sean King <seanking2919@protonmail.com> | 2022-08-08 07:32:38 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2022-08-08 07:32:38 -0600 |
| commit | 325930eecb4943bb50344159646a7c62b4bf10b3 (patch) | |
| tree | c28dd669ccdf7416a48cfded0a7b581225e54c5d /src/components/timeline/timeline.vue | |
| parent | 04e62df377fdd2ea563f58dcd23ea8048fc1c140 (diff) | |
| parent | 068139b27e00137cb1423c0a7751572c54a52148 (diff) | |
Fix merge conflicts
Diffstat (limited to 'src/components/timeline/timeline.vue')
| -rw-r--r-- | src/components/timeline/timeline.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 266c1d9a..627cafbb 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -16,7 +16,8 @@ > {{ $t('timeline.up_to_date') }} </div> - <TimelineQuickSettings v-if="!embedded" /> + <QuickFilterSettings v-if="!embedded" /> + <QuickViewSettings v-if="!embedded" /> </div> <div :class="classes.body"> <div |