solve conflict
This commit is contained in:
commit
dd0f9f971d
18
.gitattributes
vendored
18
.gitattributes
vendored
@ -2,32 +2,44 @@
|
||||
*.arrow filter=lfs diff=lfs merge=lfs -text
|
||||
*.bin filter=lfs diff=lfs merge=lfs -text
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
*.bin.* 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
|
||||
>>>>>>> f934ea452e1fc5615336b11e0c4dc5a9b5230a0b
|
||||
=======
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.ckpt filter=lfs diff=lfs merge=lfs -text
|
||||
>>>>>>> 07acdf53b4b3c34e90fe47a79562d8470dc93b5b
|
||||
*.ftz filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.h5 filter=lfs diff=lfs merge=lfs -text
|
||||
*.joblib filter=lfs diff=lfs merge=lfs -text
|
||||
*.lfs.* filter=lfs diff=lfs merge=lfs -text
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
*.model filter=lfs diff=lfs merge=lfs -text
|
||||
*.msgpack filter=lfs diff=lfs merge=lfs -text
|
||||
=======
|
||||
=======
|
||||
>>>>>>> 07acdf53b4b3c34e90fe47a79562d8470dc93b5b
|
||||
*.mlmodel filter=lfs diff=lfs merge=lfs -text
|
||||
*.model filter=lfs diff=lfs merge=lfs -text
|
||||
*.msgpack filter=lfs diff=lfs merge=lfs -text
|
||||
*.npy filter=lfs diff=lfs merge=lfs -text
|
||||
*.npz filter=lfs diff=lfs merge=lfs -text
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> f934ea452e1fc5615336b11e0c4dc5a9b5230a0b
|
||||
=======
|
||||
>>>>>>> 07acdf53b4b3c34e90fe47a79562d8470dc93b5b
|
||||
*.onnx filter=lfs diff=lfs merge=lfs -text
|
||||
*.ot filter=lfs diff=lfs merge=lfs -text
|
||||
*.parquet filter=lfs diff=lfs merge=lfs -text
|
||||
*.pb filter=lfs diff=lfs merge=lfs -text
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
*.pt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pth filter=lfs diff=lfs merge=lfs -text
|
||||
*.rar filter=lfs diff=lfs merge=lfs -text
|
||||
@ -64,6 +76,8 @@ merges.txt filter=lfs diff=lfs merge=lfs -text
|
||||
vocab.json filter=lfs diff=lfs merge=lfs -text
|
||||
tokenizer.json filter=lfs diff=lfs merge=lfs -text
|
||||
=======
|
||||
=======
|
||||
>>>>>>> 07acdf53b4b3c34e90fe47a79562d8470dc93b5b
|
||||
*.pickle filter=lfs diff=lfs merge=lfs -text
|
||||
*.pkl filter=lfs diff=lfs merge=lfs -text
|
||||
*.pt filter=lfs diff=lfs merge=lfs -text
|
||||
@ -80,5 +94,9 @@ 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
|
||||
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
|
||||
>>>>>>> f934ea452e1fc5615336b11e0c4dc5a9b5230a0b
|
||||
=======
|
||||
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
|
||||
>>>>>>> 07acdf53b4b3c34e90fe47a79562d8470dc93b5b
|
||||
|
||||
Loading…
Reference in New Issue
Block a user