diff --git a/.gitattributes b/.gitattributes index 6042946..f410f32 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40 *.bin.* filter=lfs diff=lfs merge=lfs -text *.bz2 filter=lfs diff=lfs merge=lfs -text ======= @@ -17,7 +21,15 @@ ======= *.bz2 filter=lfs diff=lfs merge=lfs -text *.ckpt filter=lfs diff=lfs merge=lfs -text +<<<<<<< HEAD >>>>>>> 8283d5e4307c53a864411b01b43fc1d1365978ae +======= +>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d +======= +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.ckpt filter=lfs diff=lfs merge=lfs -text +>>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f +>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40 *.ftz filter=lfs diff=lfs merge=lfs -text *.gz filter=lfs diff=lfs merge=lfs -text *.h5 filter=lfs diff=lfs merge=lfs -text @@ -26,13 +38,23 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40 *.model filter=lfs diff=lfs merge=lfs -text *.msgpack filter=lfs diff=lfs merge=lfs -text ======= ======= >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849 ======= +<<<<<<< HEAD >>>>>>> 8283d5e4307c53a864411b01b43fc1d1365978ae +======= +>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d +======= +>>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f +>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40 *.mlmodel filter=lfs diff=lfs merge=lfs -text *.model filter=lfs diff=lfs merge=lfs -text *.msgpack filter=lfs diff=lfs merge=lfs -text @@ -40,11 +62,21 @@ *.npz filter=lfs diff=lfs merge=lfs -text <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40 >>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352 ======= >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849 ======= +<<<<<<< HEAD >>>>>>> 8283d5e4307c53a864411b01b43fc1d1365978ae +======= +>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d +======= +>>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f +>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40 *.onnx filter=lfs diff=lfs merge=lfs -text *.ot filter=lfs diff=lfs merge=lfs -text *.parquet filter=lfs diff=lfs merge=lfs -text @@ -52,6 +84,10 @@ <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40 *.pt filter=lfs diff=lfs merge=lfs -text *.pth filter=lfs diff=lfs merge=lfs -text *.rar filter=lfs diff=lfs merge=lfs -text @@ -90,7 +126,13 @@ tokenizer.json filter=lfs diff=lfs merge=lfs -text ======= >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849 ======= +<<<<<<< HEAD >>>>>>> 8283d5e4307c53a864411b01b43fc1d1365978ae +======= +>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d +======= +>>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f +>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40 *.pickle filter=lfs diff=lfs merge=lfs -text *.pkl filter=lfs diff=lfs merge=lfs -text *.pt filter=lfs diff=lfs merge=lfs -text @@ -109,6 +151,10 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text *tfevents* filter=lfs diff=lfs merge=lfs -text <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40 *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text >>>>>>> 4e5a12c7333865beb434d4ee80b218c32d141352 ======= @@ -116,4 +162,11 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text >>>>>>> ba5e8e17d2dab3c94db703030291c6349154e849 ======= *.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text +<<<<<<< HEAD >>>>>>> 8283d5e4307c53a864411b01b43fc1d1365978ae +======= +>>>>>>> e4732774dd7bad94b1e2de2439cb8d7f55f65a7d +======= +*.EncryptBy4pd filter=lfs diff=lfs merge=lfs -text +>>>>>>> 57db79b3cf6873ca3c8d7d6b056500e4f5ac930f +>>>>>>> 29cbb4baae82dfd579ec44e76ad13d223dbd9c40