public/model-deepseek-ocr-xw
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-11-03 17:37:39 +08:00
commit 252e9b59e1
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitattributes vendored
View File

@ -2,32 +2,44 @@
*.arrow filter=lfs diff=lfs merge=lfs -text *.arrow filter=lfs diff=lfs merge=lfs -text
*.bin filter=lfs diff=lfs merge=lfs -text *.bin filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
*.bin.* filter=lfs diff=lfs merge=lfs -text *.bin.* filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text *.bz2 filter=lfs diff=lfs merge=lfs -text
======= =======
*.bz2 filter=lfs diff=lfs merge=lfs -text *.bz2 filter=lfs diff=lfs merge=lfs -text
*.ckpt filter=lfs diff=lfs merge=lfs -text *.ckpt filter=lfs diff=lfs merge=lfs -text
>>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352 >>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352
=======
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.ckpt filter=lfs diff=lfs merge=lfs -text
>>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
*.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
*.joblib filter=lfs diff=lfs merge=lfs -text *.joblib filter=lfs diff=lfs merge=lfs -text
*.lfs.* filter=lfs diff=lfs merge=lfs -text *.lfs.* filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
*.model filter=lfs diff=lfs merge=lfs -text *.model filter=lfs diff=lfs merge=lfs -text
*.msgpack filter=lfs diff=lfs merge=lfs -text *.msgpack filter=lfs diff=lfs merge=lfs -text
======= =======
=======
>>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
*.mlmodel filter=lfs diff=lfs merge=lfs -text *.mlmodel filter=lfs diff=lfs merge=lfs -text
*.model filter=lfs diff=lfs merge=lfs -text *.model filter=lfs diff=lfs merge=lfs -text
*.msgpack filter=lfs diff=lfs merge=lfs -text *.msgpack filter=lfs diff=lfs merge=lfs -text
*.npy filter=lfs diff=lfs merge=lfs -text *.npy filter=lfs diff=lfs merge=lfs -text
*.npz filter=lfs diff=lfs merge=lfs -text *.npz filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD
>>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352 >>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352
=======
>>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
*.onnx filter=lfs diff=lfs merge=lfs -text *.onnx filter=lfs diff=lfs merge=lfs -text
*.ot filter=lfs diff=lfs merge=lfs -text *.ot filter=lfs diff=lfs merge=lfs -text
*.parquet filter=lfs diff=lfs merge=lfs -text *.parquet filter=lfs diff=lfs merge=lfs -text
*.pb filter=lfs diff=lfs merge=lfs -text *.pb filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
*.pt filter=lfs diff=lfs merge=lfs -text *.pt filter=lfs diff=lfs merge=lfs -text
*.pth filter=lfs diff=lfs merge=lfs -text *.pth filter=lfs diff=lfs merge=lfs -text
*.rar filter=lfs diff=lfs merge=lfs -text *.rar filter=lfs diff=lfs merge=lfs -text
@ -63,6 +75,8 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
model-00001-of-000001.safetensors filter=lfs diff=lfs merge=lfs -text model-00001-of-000001.safetensors filter=lfs diff=lfs merge=lfs -text
tokenizer.json filter=lfs diff=lfs merge=lfs -text tokenizer.json filter=lfs diff=lfs merge=lfs -text
======= =======
=======
>>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849
*.pickle filter=lfs diff=lfs merge=lfs -text *.pickle filter=lfs diff=lfs merge=lfs -text
*.pkl filter=lfs diff=lfs merge=lfs -text *.pkl filter=lfs diff=lfs merge=lfs -text
*.pt filter=lfs diff=lfs merge=lfs -text *.pt filter=lfs diff=lfs merge=lfs -text
@ -79,5 +93,9 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text
*tfevents* filter=lfs diff=lfs merge=lfs -text *tfevents* filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
>>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352 >>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352
=======
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
>>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849