Fix merge
Browse files- .gitattributes +3 -0
.gitattributes
CHANGED
|
@@ -32,4 +32,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
|
| 32 |
*.zip filter=lfs diff=lfs merge=lfs -text
|
| 33 |
*.zst filter=lfs diff=lfs merge=lfs -text
|
| 34 |
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
|
|
|
| 35 |
model_weights filter=lfs diff=lfs merge=lfs -text
|
|
|
|
|
|
|
|
|
| 32 |
*.zip filter=lfs diff=lfs merge=lfs -text
|
| 33 |
*.zst filter=lfs diff=lfs merge=lfs -text
|
| 34 |
*tfevents* filter=lfs diff=lfs merge=lfs -text
|
| 35 |
+
<<<<<<< HEAD
|
| 36 |
model_weights filter=lfs diff=lfs merge=lfs -text
|
| 37 |
+
=======
|
| 38 |
+
>>>>>>> 5801e8ae0765998978e84f053050a80d0b654f82
|