Resolve merge conflict in .gitattributes
Browse files- .gitattributes +2 -0
.gitattributes
CHANGED
|
@@ -33,5 +33,7 @@ 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
|
|
|
|
|
|
|
| 36 |
*.png filter=lfs diff=lfs merge=lfs -text
|
| 37 |
*.webm 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
|
| 36 |
+
|
| 37 |
+
# your additions
|
| 38 |
*.png filter=lfs diff=lfs merge=lfs -text
|
| 39 |
*.webm filter=lfs diff=lfs merge=lfs -text
|