public/model-whisper-large
62
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

solve conflict

Browse Source
This commit is contained in:
zhufq 2025-12-25 14:58:42 +08:00
commit cad5f8f7eb
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitattributes vendored
View File

@ -5,6 +5,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
======= =======
*.ckpt filter=lfs diff=lfs merge=lfs -text *.ckpt filter=lfs diff=lfs merge=lfs -text
>>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f >>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
@ -14,6 +15,9 @@
======= =======
*.ckpt filter=lfs diff=lfs merge=lfs -text *.ckpt filter=lfs diff=lfs merge=lfs -text
>>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f >>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f
=======
*.ckpt filter=lfs diff=lfs merge=lfs -text
>>>>>>> df30393a31e07a5b8976b353e19491101c276854
*.ftz filter=lfs diff=lfs merge=lfs -text *.ftz filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text *.gz filter=lfs diff=lfs merge=lfs -text
*.h5 filter=lfs diff=lfs merge=lfs -text *.h5 filter=lfs diff=lfs merge=lfs -text
@ -36,6 +40,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
saved_model/**/* 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
======= =======
@ -43,17 +48,22 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
>>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125 >>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125
======= =======
>>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f >>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f
=======
>>>>>>> df30393a31e07a5b8976b353e19491101c276854
*.safetensors filter=lfs diff=lfs merge=lfs -text *.safetensors filter=lfs diff=lfs merge=lfs -text
saved_model/**/* 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
*.tar filter=lfs diff=lfs merge=lfs -text *.tar filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f >>>>>>> ff724d3dcf8f77ed42268106409f26cfc550447f
======= =======
>>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125 >>>>>>> 639c43842bf6af7f916dc79f7f1e0ecd5ef92125
======= =======
>>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f >>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f
=======
>>>>>>> df30393a31e07a5b8976b353e19491101c276854
*.tflite filter=lfs diff=lfs merge=lfs -text *.tflite filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text *.tgz filter=lfs diff=lfs merge=lfs -text
*.wasm filter=lfs diff=lfs merge=lfs -text *.wasm filter=lfs diff=lfs merge=lfs -text
@ -64,6 +74,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
model.safetensors filter=lfs diff=lfs merge=lfs -text model.safetensors filter=lfs diff=lfs merge=lfs -text
flax_model.msgpack 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 pytorch_model.bin filter=lfs diff=lfs merge=lfs -text
@ -77,3 +88,6 @@ tf_model.h5 filter=lfs diff=lfs merge=lfs -text
======= =======
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
>>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f >>>>>>> 4918c678dfb0fef860f8d6433a0379fdd5ebc46f
=======
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
>>>>>>> df30393a31e07a5b8976b353e19491101c276854