Home Explore Help
Register Sign In
tomi
/
u-fit
1
0
Fork 0

2 Commits 99bc6f0131 ... 446e7f0343

Author SHA1 Message Date
  Tomi Cvetic 446e7f0343 resolved conflict. 4 years ago
  Tomi Cvetic 8085e02058 resolved conflict. 4 years ago
1 changed files with 0 additions and 4 deletions
Unified View Show Diff Stats
  1. 0 4
      frontend/src/file/components/UploadFile.tsx

+ 0 - 4
frontend/src/file/components/UploadFile.tsx
View File 

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