Resolve .gitattributes conflict before merge
Browse files- .gitattributes +6 -5
.gitattributes
CHANGED
|
@@ -349,8 +349,9 @@ saved_model/**/* filter=lfs diff=lfs merge=lfs -text
|
|
| 349 |
87025/JobSimulator_87025__4/Poses/Poses_and_Interactions_2026-05-18-20-23-38-434.csv filter=lfs diff=lfs merge=lfs -text
|
| 350 |
87025/JobSimulator_87025__5/Poses/Poses_and_Interactions_2026-05-18-20-36-47-768.csv filter=lfs diff=lfs merge=lfs -text
|
| 351 |
37450/JobSimulator_37450__2/Poses/Poses_and_Interactions_2026-05-20-16-39-28-898.csv filter=lfs diff=lfs merge=lfs -text
|
| 352 |
-
|
| 353 |
-
|
| 354 |
-
|
| 355 |
-
|
| 356 |
-
|
|
|
|
|
|
| 349 |
87025/JobSimulator_87025__4/Poses/Poses_and_Interactions_2026-05-18-20-23-38-434.csv filter=lfs diff=lfs merge=lfs -text
|
| 350 |
87025/JobSimulator_87025__5/Poses/Poses_and_Interactions_2026-05-18-20-36-47-768.csv filter=lfs diff=lfs merge=lfs -text
|
| 351 |
37450/JobSimulator_37450__2/Poses/Poses_and_Interactions_2026-05-20-16-39-28-898.csv filter=lfs diff=lfs merge=lfs -text
|
| 352 |
+
29762/JobSimulator_29762__2/Poses/Poses_and_Interactions_2026-04-06-20-53-53-844.csv filter=lfs diff=lfs merge=lfs -text
|
| 353 |
+
29762/JobSimulator_29762__3/Poses/Poses_and_Interactions_2026-04-06-21-07-06-945.csv filter=lfs diff=lfs merge=lfs -text
|
| 354 |
+
29762/JobSimulator_29762__4/Poses/Poses_and_Interactions_2026-04-06-21-33-32-885.csv filter=lfs diff=lfs merge=lfs -text
|
| 355 |
+
29762/JobSimulator_29762__5/Poses/Poses_and_Interactions_2026-04-06-21-48-53-744.csv filter=lfs diff=lfs merge=lfs -text
|
| 356 |
+
35557/JobSimulator_35557__4/Poses/Poses_and_Interactions_2026-04-01-21-41-27-330.csv filter=lfs diff=lfs merge=lfs -text
|
| 357 |
+
35557/JobSimulator_35557__5/Poses/Poses_and_Interactions_2026-04-01-21-51-50-947.csv filter=lfs diff=lfs merge=lfs -text
|