solve conflict
This commit is contained in:
commit
2100dd241d
15
.gitattributes
vendored
15
.gitattributes
vendored
@ -2,6 +2,10 @@
|
||||
*.arrow filter=lfs diff=lfs merge=lfs -text
|
||||
*.bin filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
*.ckpt filter=lfs diff=lfs merge=lfs -text
|
||||
>>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
|
||||
*.ftz filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.h5 filter=lfs diff=lfs merge=lfs -text
|
||||
@ -21,8 +25,15 @@
|
||||
*.pt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pth filter=lfs diff=lfs merge=lfs -text
|
||||
*.rar filter=lfs diff=lfs merge=lfs -text
|
||||
<<<<<<< HEAD
|
||||
saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
||||
*.tar.* filter=lfs diff=lfs merge=lfs -text
|
||||
=======
|
||||
*.safetensors filter=lfs diff=lfs merge=lfs -text
|
||||
saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
||||
*.tar.* filter=lfs diff=lfs merge=lfs -text
|
||||
*.tar filter=lfs diff=lfs merge=lfs -text
|
||||
>>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
|
||||
*.tflite filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.wasm filter=lfs diff=lfs merge=lfs -text
|
||||
@ -30,7 +41,11 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
||||
<<<<<<< HEAD
|
||||
model.safetensors filter=lfs diff=lfs merge=lfs -text
|
||||
flax_model.msgpack filter=lfs diff=lfs merge=lfs -text
|
||||
pytorch_model.bin filter=lfs diff=lfs merge=lfs -text
|
||||
tf_model.h5 filter=lfs diff=lfs merge=lfs -text
|
||||
=======
|
||||
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
|
||||
>>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
|
||||
|
||||
Loading…
Reference in New Issue
Block a user