xraijobsimulator commited on
Commit
ead64fe
·
verified ·
1 Parent(s): 8cd877b

Resolve .gitattributes conflict before merge

Browse files
Files changed (1) hide show
  1. .gitattributes +5 -4
.gitattributes CHANGED
@@ -355,7 +355,8 @@ saved_model/**/* 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
358
- 78572/JobSimulator_78572__1/Poses/Poses_and_Interactions_2026-04-08-21-01-58-647.csv filter=lfs diff=lfs merge=lfs -text
359
- 78572/JobSimulator_78572__2/Poses/Poses_and_Interactions_2026-04-08-21-15-20-760.csv filter=lfs diff=lfs merge=lfs -text
360
- 78572/JobSimulator_78572__4/Poses/Poses_and_Interactions_2026-04-08-21-39-30-938.csv filter=lfs diff=lfs merge=lfs -text
361
- 78572/JobSimulator_78572__5/Poses/Poses_and_Interactions_2026-04-08-21-48-47-547.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
358
+ 99380/JobSimulator_99380__1/Poses/Poses_and_Interactions_2026-04-15-20-53-44-919.csv filter=lfs diff=lfs merge=lfs -text
359
+ 99380/JobSimulator_99380__2/Poses/Poses_and_Interactions_2026-04-15-21-08-05-419.csv filter=lfs diff=lfs merge=lfs -text
360
+ 99380/JobSimulator_99380__3/Poses/Poses_and_Interactions_2026-04-15-21-17-43-505.csv filter=lfs diff=lfs merge=lfs -text
361
+ 99380/JobSimulator_99380__4/Poses/Poses_and_Interactions_2026-04-15-21-32-53-101.csv filter=lfs diff=lfs merge=lfs -text
362
+ 99380/JobSimulator_99380__5/Poses/Poses_and_Interactions_2026-04-15-21-40-24-700.csv filter=lfs diff=lfs merge=lfs -text