sghuge commited on
Commit
e7fcdfb
·
1 Parent(s): 9adad72

fix merge conflict

Browse files
Files changed (1) hide show
  1. .gitattributes +0 -4
.gitattributes CHANGED
@@ -1,6 +1,3 @@
1
- <<<<<<< HEAD
2
- *.pth filter=lfs diff=lfs merge=lfs -text
3
- =======
4
  *.7z filter=lfs diff=lfs merge=lfs -text
5
  *.arrow filter=lfs diff=lfs merge=lfs -text
6
  *.bin filter=lfs diff=lfs merge=lfs -text
@@ -36,4 +33,3 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
36
  *.zip filter=lfs diff=lfs merge=lfs -text
37
  *.zst filter=lfs diff=lfs merge=lfs -text
38
  *tfevents* filter=lfs diff=lfs merge=lfs -text
39
- >>>>>>> 8d521d7a5c9180d509ef915330e774595b62c9a8
 
 
 
 
1
  *.7z filter=lfs diff=lfs merge=lfs -text
2
  *.arrow filter=lfs diff=lfs merge=lfs -text
3
  *.bin filter=lfs diff=lfs merge=lfs -text
 
33
  *.zip filter=lfs diff=lfs merge=lfs -text
34
  *.zst filter=lfs diff=lfs merge=lfs -text
35
  *tfevents* filter=lfs diff=lfs merge=lfs -text