Commit0b2b732

committed

chore: correct bad rebase

Signed-off-by: Danny Kopping <dannykopping@gmail.com>

1 parente48df2e commit0b2b732Copy full SHA for 0b2b732

File tree

+553

-327

lines changed

+553

-327

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@`
`68`	`68`	`"available": 0,`
`69`	`69`	`"most_recently_seen": null`
`70`	`70`	`},`
`71`		`- "template_version_preset_id": null`
	`71`	`+ "template_version_preset_id": null,`
	`72`	`+ "has_ai_task": false`
`72`	`73`	`},`
`73`	`74`	`"latest_app_status": null,`
`74`	`75`	`"outdated": false,`

File renamed without changes.

File renamed without changes.

Lines changed: 21 additions & 21 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1093,8 +1093,8 @@ func (api *API) convertWorkspaceBuild(`
`1093`	`1093`	`hasAITask=&build.HasAITask.Bool`
`1094`	`1094`	`}`
`1095`	`1095`	`varaiTasksSidebarAppID*uuid.UUID`
`1096`		`-ifbuild.AITasksSidebarAppID.Valid {`
`1097`		`-aiTasksSidebarAppID=&build.AITasksSidebarAppID.UUID`
	`1096`	`+ifbuild.AITaskSidebarAppID.Valid {`
	`1097`	`+aiTasksSidebarAppID=&build.AITaskSidebarAppID.UUID`
`1098`	`1098`	`}`
`1099`	`1099`
`1100`	`1100`	`apiJob:=convertProvisionerJob(job)`

Comments

(0)