commit after resolve merge conflit

This commit is contained in:
Eudes Inácio
2023-03-10 09:05:33 +01:00
parent 05d8bf424e
commit 889e382905
14 changed files with 19 additions and 22 deletions
@@ -5,12 +5,9 @@ import { ToastService } from 'src/app/services/toast.service';
import { ThemeService } from 'src/app/services/theme.service'
import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page';
import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
<<<<<<< HEAD
import { HttpErrorResponse } from '@angular/common/http';
import { SessionStore } from 'src/app/store/session.service';
import { GroupContactsPage } from '../../chat/group-messages/group-contacts/group-contacts.page';
=======
>>>>>>> b8a1734abbbe321eedb202ddde21592f161acf12
@Component({