YU ZHEHAO commited on
Commit
1151b8f
·
2 Parent(s): d603803 d5069dd

Resolved conflict in .gitattributes

Browse files
Files changed (1) hide show
  1. .gitattributes +3 -0
.gitattributes CHANGED
@@ -25,6 +25,9 @@
25
  *.safetensors filter=lfs diff=lfs merge=lfs -text
26
  saved_model/**/* filter=lfs diff=lfs merge=lfs -text
27
  *.tar.* filter=lfs diff=lfs merge=lfs -text
 
 
 
28
  *.tflite filter=lfs diff=lfs merge=lfs -text
29
  *.tgz filter=lfs diff=lfs merge=lfs -text
30
  *.wasm filter=lfs diff=lfs merge=lfs -text
 
25
  *.safetensors filter=lfs diff=lfs merge=lfs -text
26
  saved_model/**/* filter=lfs diff=lfs merge=lfs -text
27
  *.tar.* filter=lfs diff=lfs merge=lfs -text
28
+ <<<<<<< HEAD
29
+ =======
30
+ >>>>>>> d5069dd5331943e7924609f0db99ae67b6bbf90b
31
  *.tflite filter=lfs diff=lfs merge=lfs -text
32
  *.tgz filter=lfs diff=lfs merge=lfs -text
33
  *.wasm filter=lfs diff=lfs merge=lfs -text