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

solve conflict

Browse Source
This commit is contained in:
zhufq 2026-02-27 15:46:23 +08:00
commit 73ea9c053f
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

@ -4,6 +4,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< 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
======= =======
@ -22,6 +23,10 @@
*.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
>>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662 >>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
=======
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.ckpt filter=lfs diff=lfs merge=lfs -text
>>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
*.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
@ -30,6 +35,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< 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
======= =======
@ -37,6 +43,8 @@
>>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee >>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
======= =======
>>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662 >>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
=======
>>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
*.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
@ -45,6 +53,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2 >>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2
======= =======
>>>>>>> 80ce3b281755c6eccc6c69262e80a4f9f2769bb4 >>>>>>> 80ce3b281755c6eccc6c69262e80a4f9f2769bb4
@ -53,6 +62,8 @@
>>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee >>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
======= =======
>>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662 >>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
=======
>>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
*.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
@ -60,6 +71,7 @@
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< 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
@ -98,6 +110,8 @@ tokenizer.json filter=lfs diff=lfs merge=lfs -text
>>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee >>>>>>> aef2389645884fed48a7f8c9a127d9cbc48f01ee
======= =======
>>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662 >>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
=======
>>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860
*.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
@ -116,6 +130,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
*tfevents* filter=lfs diff=lfs merge=lfs -text *tfevents* filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
<<<<<<< HEAD <<<<<<< HEAD
>>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2 >>>>>>> 65674cc95b554095b4244eba05b11aa90e67c5d2
@ -128,3 +143,6 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
======= =======
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
>>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662 >>>>>>> dd0b35b9754f23cd9cc1b78d0984a659ea206662
=======
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
>>>>>>> c77947f26fe7aa7284f0957c49d33c937dc09860