Sontran0108 commited on
Commit
fec7816
·
2 Parent(s): a43192e 06b0a69

Resolve merge conflict in .gitattributes

Browse files
Files changed (1) hide show
  1. .gitattributes +4 -0
.gitattributes CHANGED
@@ -25,6 +25,10 @@
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
+ *.tar filter=lfs diff=lfs merge=lfs -text
31
+ >>>>>>> 06b0a69cfaebf5e60230ff3cb532a1a54589c537
32
  *.tflite filter=lfs diff=lfs merge=lfs -text
33
  *.tgz filter=lfs diff=lfs merge=lfs -text
34
  *.wasm filter=lfs diff=lfs merge=lfs -text