Resolvendo conflitos de merge
Browse files- .gitattributes +38 -0
.gitattributes
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
|
|
| 1 |
*.7z filter=lfs diff=lfs merge=lfs -text
|
| 2 |
*.arrow filter=lfs diff=lfs merge=lfs -text
|
| 3 |
*.bin filter=lfs diff=lfs merge=lfs -text
|
|
@@ -33,3 +34,40 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
|
| 33 |
*.zip filter=lfs diff=lfs merge=lfs -text
|
| 34 |
*.zst filter=lfs diff=lfs merge=lfs -text
|
| 35 |
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<<<<<<< HEAD
|
| 2 |
*.7z filter=lfs diff=lfs merge=lfs -text
|
| 3 |
*.arrow filter=lfs diff=lfs merge=lfs -text
|
| 4 |
*.bin filter=lfs diff=lfs merge=lfs -text
|
|
|
|
| 34 |
*.zip filter=lfs diff=lfs merge=lfs -text
|
| 35 |
*.zst filter=lfs diff=lfs merge=lfs -text
|
| 36 |
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
| 37 |
+
=======
|
| 38 |
+
*.7z filter=lfs diff=lfs merge=lfs -text
|
| 39 |
+
*.arrow filter=lfs diff=lfs merge=lfs -text
|
| 40 |
+
*.bin filter=lfs diff=lfs merge=lfs -text
|
| 41 |
+
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
| 42 |
+
*.ckpt filter=lfs diff=lfs merge=lfs -text
|
| 43 |
+
*.ftz filter=lfs diff=lfs merge=lfs -text
|
| 44 |
+
*.gz filter=lfs diff=lfs merge=lfs -text
|
| 45 |
+
*.h5 filter=lfs diff=lfs merge=lfs -text
|
| 46 |
+
*.joblib filter=lfs diff=lfs merge=lfs -text
|
| 47 |
+
*.lfs.* filter=lfs diff=lfs merge=lfs -text
|
| 48 |
+
*.mlmodel filter=lfs diff=lfs merge=lfs -text
|
| 49 |
+
*.model filter=lfs diff=lfs merge=lfs -text
|
| 50 |
+
*.msgpack filter=lfs diff=lfs merge=lfs -text
|
| 51 |
+
*.npy filter=lfs diff=lfs merge=lfs -text
|
| 52 |
+
*.npz filter=lfs diff=lfs merge=lfs -text
|
| 53 |
+
*.onnx filter=lfs diff=lfs merge=lfs -text
|
| 54 |
+
*.ot filter=lfs diff=lfs merge=lfs -text
|
| 55 |
+
*.parquet filter=lfs diff=lfs merge=lfs -text
|
| 56 |
+
*.pb filter=lfs diff=lfs merge=lfs -text
|
| 57 |
+
*.pickle filter=lfs diff=lfs merge=lfs -text
|
| 58 |
+
*.pkl filter=lfs diff=lfs merge=lfs -text
|
| 59 |
+
*.pt filter=lfs diff=lfs merge=lfs -text
|
| 60 |
+
*.pth filter=lfs diff=lfs merge=lfs -text
|
| 61 |
+
*.rar filter=lfs diff=lfs merge=lfs -text
|
| 62 |
+
*.safetensors filter=lfs diff=lfs merge=lfs -text
|
| 63 |
+
saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
| 64 |
+
*.tar.* filter=lfs diff=lfs merge=lfs -text
|
| 65 |
+
*.tar filter=lfs diff=lfs merge=lfs -text
|
| 66 |
+
*.tflite filter=lfs diff=lfs merge=lfs -text
|
| 67 |
+
*.tgz filter=lfs diff=lfs merge=lfs -text
|
| 68 |
+
*.wasm filter=lfs diff=lfs merge=lfs -text
|
| 69 |
+
*.xz filter=lfs diff=lfs merge=lfs -text
|
| 70 |
+
*.zip filter=lfs diff=lfs merge=lfs -text
|
| 71 |
+
*.zst filter=lfs diff=lfs merge=lfs -text
|
| 72 |
+
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
| 73 |
+
>>>>>>> b3e21c7126e08eeba6d72ad212aeee7365dc8a0c
|