solve conflict
This commit is contained in:
commit
11aaeb6912
10
.gitattributes
vendored
10
.gitattributes
vendored
@ -1,7 +1,10 @@
|
|||||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
*.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
|
||||||
*.bin.* filter=lfs diff=lfs merge=lfs -text
|
*.bin.* filter=lfs diff=lfs merge=lfs -text
|
||||||
|
=======
|
||||||
|
>>>>>>> c854ab92a6520ab82f6a6874e0b88699b9b0b967
|
||||||
*.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
|
||||||
*.ftz filter=lfs diff=lfs merge=lfs -text
|
*.ftz filter=lfs diff=lfs merge=lfs -text
|
||||||
@ -18,6 +21,7 @@
|
|||||||
*.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
|
||||||
*.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
|
||||||
@ -82,6 +86,8 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
|||||||
*.json filter=lfs diff=lfs merge=lfs -text
|
*.json filter=lfs diff=lfs merge=lfs -text
|
||||||
dataset_infos.json ignore
|
dataset_infos.json ignore
|
||||||
*.csv filter=lfs diff=lfs merge=lfs -text
|
*.csv filter=lfs diff=lfs merge=lfs -text
|
||||||
|
=======
|
||||||
|
>>>>>>> c854ab92a6520ab82f6a6874e0b88699b9b0b967
|
||||||
*.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
|
||||||
@ -98,4 +104,8 @@ 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
|
||||||
|
=======
|
||||||
|
*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text
|
||||||
|
>>>>>>> c854ab92a6520ab82f6a6874e0b88699b9b0b967
|
||||||
|
|||||||
1
dataset-samsum-corpus
Submodule
1
dataset-samsum-corpus
Submodule
@ -0,0 +1 @@
|
|||||||
|
Subproject commit 770dc84e80bf4cd9de9445bac37ace3879389cb9
|
||||||
BIN
dataset_infos.json
(Stored with Git LFS)
BIN
dataset_infos.json
(Stored with Git LFS)
Binary file not shown.
Loading…
Reference in New Issue
Block a user