Skip to content

Commit e2424c4

Browse files
committed
whoops, merge conflicts
2 parents c946b8e + d75198f commit e2424c4

File tree

9 files changed

+5
-54
lines changed

9 files changed

+5
-54
lines changed

β€Žcontent/videos/ml5/7-bodypose/pose-detection/index.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
"canContribute": true,
1010
"timestamps": [
1111
{ "time": "0:00", "title": "Introduction" },
12-
{ "time": "0:45", "title": "BodyPose model" },
12+
{ "time": "0:45", "title": "What is the BodyPose model?" },
1313
{ "time": "3:28", "title": "Coco Dataset" },
14-
{ "time": "4:04", "title": "Projects that use pose detection" },
14+
{ "time": "4:04", "title": "Creative Inspiration" },
1515
{ "time": "5:49", "title": "Start coding" },
16-
{ "time": "8:58", "title": "Keypoint index values" },
17-
{ "time": "15:39", "title": "Connections between the keypoints" },
18-
{ "time": "17:57", "title": "Adding p5.distance()" },
16+
{ "time": "8:58", "title": "Working with specific keypoints" },
17+
{ "time": "15:39", "title": "Skeleton connections between the keypoints" },
18+
{ "time": "17:57", "title": "Using dist() function" },
1919
{ "time": "19:39", "title": "BlazePose" },
2020
{ "time": "20:56", "title": "Outro" }
2121
],

β€Žcontent/videos/ml5/7-bodypose/pose-detection/showcase/contribution1.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

β€Žcontent/videos/ml5/7-bodypose/pose-detection/showcase/contribution2.json

Lines changed: 0 additions & 8 deletions
This file was deleted.
Binary file not shown.

β€Žcontent/videos/ml5/7-bodypose/pose-detection/showcase/contribution3.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

β€Žcontent/videos/ml5/7-bodypose/pose-detection/showcase/contribution4.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

β€Žcontent/videos/ml5/7-bodypose/pose-detection/showcase/contribution5.json

Lines changed: 0 additions & 8 deletions
This file was deleted.
Binary file not shown.

β€Žcontent/videos/ml5/7-bodypose/pose-detection/showcase/contribution6.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
Β (0)