resolved conflicts

Author: lizabre

src/containers/my-cooperations/cooperation-notes/CooperationNotes.tsx

@@ -11,7 +11,6 @@ import { CooperationNotesService } from '~/services/cooperation-service'
 import CreateOrEditNote from '~/containers/my-cooperations/cooperation-notes/create-or-edit-note/CreateOrEditNote'
 import NoteView from '~/containers/my-cooperations/cooperation-notes/note-view/NoteView'
 import Loader from '~/components/loader/Loader'
-import { noteNotFoundError } from '~/containers/my-cooperations/cooperation-notes/CooperationNotes.constants'
 
 import { snackbarVariants } from '~/constants'
 import { styles } from '~/containers/my-cooperations/cooperation-notes/CooperationNotes.styles'

src/services/cooperation-service.ts

@@ -13,8 +13,6 @@ import type {
 } from '~/types'
 import { getFullUrl } from '~/utils/get-full-url'
 import { baseService } from '~/services/base-service'
-import { AxiosResponse } from 'axios'
-import { axiosClient } from '~/plugins/axiosClient'
 
 export const cooperationService = {
   getCooperations: async (params: GetCooperationsParams) => {