diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2022-08-25 14:25:56 +0200 |
|---|---|---|
| committer | John Molakvoæ <skjnldsv@protonmail.com> | 2022-08-26 19:51:10 +0200 |
| commit | f1ce2c2b9303426266a81cacb8efb4ebdb6d2458 (patch) | |
| tree | 51863c552a0ab5576606fcae2fc823bb74440e3d /apps/user_status/src/components/SetStatusModal.vue | |
| parent | 1d35a53991f356976d78b8053651737821502687 (diff) | |
| download | nextcloud-server-f1ce2c2b9303426266a81cacb8efb4ebdb6d2458.tar.gz nextcloud-server-f1ce2c2b9303426266a81cacb8efb4ebdb6d2458.zip | |
Fix rebasing issues and improve profile settings page a bit more
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Diffstat (limited to 'apps/user_status/src/components/SetStatusModal.vue')
| -rw-r--r-- | apps/user_status/src/components/SetStatusModal.vue | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/apps/user_status/src/components/SetStatusModal.vue b/apps/user_status/src/components/SetStatusModal.vue index ed6854b2bb1..e1ba63337ef 100644 --- a/apps/user_status/src/components/SetStatusModal.vue +++ b/apps/user_status/src/components/SetStatusModal.vue @@ -72,18 +72,8 @@ <script> import { showError } from '@nextcloud/dialogs' -<<<<<<< HEAD -import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker' import NcModal from '@nextcloud/vue/dist/Components/NcModal' import NcButton from '@nextcloud/vue/dist/Components/NcButton' -||||||| parent of f456d3bb0f (Various fixes) -import EmojiPicker from '@nextcloud/vue/dist/Components/EmojiPicker' -import Modal from '@nextcloud/vue/dist/Components/Modal' -import ButtonVue from '@nextcloud/vue/dist/Components/Button' -======= -import Modal from '@nextcloud/vue/dist/Components/Modal' -import ButtonVue from '@nextcloud/vue/dist/Components/Button' ->>>>>>> f456d3bb0f (Various fixes) import { getAllStatusOptions } from '../services/statusOptionsService' import OnlineStatusMixin from '../mixins/OnlineStatusMixin' import PredefinedStatusesList from './PredefinedStatusesList' @@ -97,15 +87,7 @@ export default { components: { ClearAtSelect, CustomMessageInput, -<<<<<<< HEAD - NcEmojiPicker, NcModal, -||||||| parent of f456d3bb0f (Various fixes) - EmojiPicker, - Modal, -======= - Modal, ->>>>>>> f456d3bb0f (Various fixes) OnlineStatusSelect, PredefinedStatusesList, NcButton, |