frontend/src/file/components/UploadFile.tsx

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-import { useUploadFileMutation, File } from '../../gql'
-=======
 import { useUploadFileMutation, File, FilesDocument } from '../../gql'
->>>>>>> 09cdf731785304362601ab5d7e726061524c82a3
 import { useForm, TextInput } from '../../form'
 import { customEvent } from '../../lib/customEvent'