Resolved conflict in .gitattributes
Browse files- .gitattributes +38 -0
.gitattributes
CHANGED
|
@@ -1,3 +1,41 @@
|
|
|
|
|
| 1 |
*.safetensors filter=lfs diff=lfs merge=lfs -text
|
| 2 |
*.bpe.model filter=lfs diff=lfs merge=lfs -text
|
| 3 |
*.json filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<<<<<<< HEAD
|
| 2 |
*.safetensors filter=lfs diff=lfs merge=lfs -text
|
| 3 |
*.bpe.model filter=lfs diff=lfs merge=lfs -text
|
| 4 |
*.json filter=lfs diff=lfs merge=lfs -text
|
| 5 |
+
=======
|
| 6 |
+
*.7z filter=lfs diff=lfs merge=lfs -text
|
| 7 |
+
*.arrow filter=lfs diff=lfs merge=lfs -text
|
| 8 |
+
*.bin filter=lfs diff=lfs merge=lfs -text
|
| 9 |
+
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
| 10 |
+
*.ckpt filter=lfs diff=lfs merge=lfs -text
|
| 11 |
+
*.ftz filter=lfs diff=lfs merge=lfs -text
|
| 12 |
+
*.gz filter=lfs diff=lfs merge=lfs -text
|
| 13 |
+
*.h5 filter=lfs diff=lfs merge=lfs -text
|
| 14 |
+
*.joblib filter=lfs diff=lfs merge=lfs -text
|
| 15 |
+
*.lfs.* filter=lfs diff=lfs merge=lfs -text
|
| 16 |
+
*.mlmodel filter=lfs diff=lfs merge=lfs -text
|
| 17 |
+
*.model filter=lfs diff=lfs merge=lfs -text
|
| 18 |
+
*.msgpack filter=lfs diff=lfs merge=lfs -text
|
| 19 |
+
*.npy filter=lfs diff=lfs merge=lfs -text
|
| 20 |
+
*.npz filter=lfs diff=lfs merge=lfs -text
|
| 21 |
+
*.onnx filter=lfs diff=lfs merge=lfs -text
|
| 22 |
+
*.ot filter=lfs diff=lfs merge=lfs -text
|
| 23 |
+
*.parquet filter=lfs diff=lfs merge=lfs -text
|
| 24 |
+
*.pb filter=lfs diff=lfs merge=lfs -text
|
| 25 |
+
*.pickle filter=lfs diff=lfs merge=lfs -text
|
| 26 |
+
*.pkl filter=lfs diff=lfs merge=lfs -text
|
| 27 |
+
*.pt filter=lfs diff=lfs merge=lfs -text
|
| 28 |
+
*.pth filter=lfs diff=lfs merge=lfs -text
|
| 29 |
+
*.rar filter=lfs diff=lfs merge=lfs -text
|
| 30 |
+
*.safetensors filter=lfs diff=lfs merge=lfs -text
|
| 31 |
+
saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
| 32 |
+
*.tar.* filter=lfs diff=lfs merge=lfs -text
|
| 33 |
+
*.tar filter=lfs diff=lfs merge=lfs -text
|
| 34 |
+
*.tflite filter=lfs diff=lfs merge=lfs -text
|
| 35 |
+
*.tgz filter=lfs diff=lfs merge=lfs -text
|
| 36 |
+
*.wasm filter=lfs diff=lfs merge=lfs -text
|
| 37 |
+
*.xz filter=lfs diff=lfs merge=lfs -text
|
| 38 |
+
*.zip filter=lfs diff=lfs merge=lfs -text
|
| 39 |
+
*.zst filter=lfs diff=lfs merge=lfs -text
|
| 40 |
+
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
| 41 |
+
>>>>>>> 554a1f53d7edb7c02a42ea8f8f164cc3b495dc3b
|