solve conflict
This commit is contained in:
commit
0e49363d8c
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
|
||||
>>>>>>> 7439e48a1cb8c090785b780f01487a6910309e98
|
||||
=======
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.ckpt filter=lfs diff=lfs merge=lfs -text
|
||||
>>>>>>> d678ba05f2672a81c92afd8221b0c074211b6c5d
|
||||
*.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
|
||||
=======
|
||||
=======
|
||||
>>>>>>> d678ba05f2672a81c92afd8221b0c074211b6c5d
|
||||
*.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
|
||||
>>>>>>> 7439e48a1cb8c090785b780f01487a6910309e98
|
||||
=======
|
||||
>>>>>>> d678ba05f2672a81c92afd8221b0c074211b6c5d
|
||||
*.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
|
||||
@ -50,6 +62,8 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
||||
*.ggml filter=lfs diff=lfs merge=lfs -text
|
||||
*.llamafile* filter=lfs diff=lfs merge=lfs -text
|
||||
=======
|
||||
=======
|
||||
>>>>>>> d678ba05f2672a81c92afd8221b0c074211b6c5d
|
||||
*.pickle filter=lfs diff=lfs merge=lfs -text
|
||||
*.pkl filter=lfs diff=lfs merge=lfs -text
|
||||
*.pt filter=lfs diff=lfs merge=lfs -text
|
||||
@ -66,5 +80,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
|
||||
>>>>>>> 7439e48a1cb8c090785b780f01487a6910309e98
|
||||
=======
|
||||
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
|
||||
>>>>>>> d678ba05f2672a81c92afd8221b0c074211b6c5d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user