merge conficts
Browse files- .gitattributes +1 -0
.gitattributes
CHANGED
|
@@ -57,6 +57,7 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
|
| 57 |
# Video files - compressed
|
| 58 |
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
| 59 |
*.webm filter=lfs diff=lfs merge=lfs -text
|
|
|
|
| 60 |
data/heldout.zarr filter=lfs diff=lfs merge=lfs -text
|
| 61 |
data/train.zarr filter=lfs diff=lfs merge=lfs -text
|
| 62 |
val.bin filter=lfs diff=lfs merge=lfs -text
|
|
|
|
| 57 |
# Video files - compressed
|
| 58 |
*.mp4 filter=lfs diff=lfs merge=lfs -text
|
| 59 |
*.webm filter=lfs diff=lfs merge=lfs -text
|
| 60 |
+
|
| 61 |
data/heldout.zarr filter=lfs diff=lfs merge=lfs -text
|
| 62 |
data/train.zarr filter=lfs diff=lfs merge=lfs -text
|
| 63 |
val.bin filter=lfs diff=lfs merge=lfs -text
|