coder
diff --git a/‎coderd/database/dbauthz/dbauthz.go
Lines changed: 4 additions & 6 deletions b/‎coderd/database/dbauthz/dbauthz.go
Lines changed: 4 additions & 6 deletions
diff --git a/‎coderd/database/dbmetrics/dbmetrics.go
Lines changed: 4 additions & 6 deletions b/‎coderd/database/dbmetrics/dbmetrics.go
Lines changed: 4 additions & 6 deletions
diff --git a/‎coderd/database/dbmock/dbmock.go
Lines changed: 8 additions & 13 deletions b/‎coderd/database/dbmock/dbmock.go
Lines changed: 8 additions & 13 deletions
@@ -1871,16 +1871,15 @@ func (q *querier) GetReplicasUpdatedAfter(ctx context.Context, updatedAt time.Ti
 	return q.db.GetReplicasUpdatedAfter(ctx, updatedAt)
 }
 
-<<<<<<< HEAD
 func (q *querier) GetReportGeneratorLogByUserAndTemplate(ctx context.Context, arg database.GetReportGeneratorLogByUserAndTemplateParams) (database.ReportGeneratorLog, error) {
 	panic("not implemented")
-=======
+}
+
 func (q *querier) GetRuntimeConfig(ctx context.Context, key string) (string, error) {
 	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
 		return "", err
 	}
 	return q.db.GetRuntimeConfig(ctx, key)
->>>>>>> main
 }
 
 func (q *querier) GetTailnetAgents(ctx context.Context, id uuid.UUID) ([]database.TailnetAgent, error) {
@@ -3937,16 +3936,15 @@ func (q *querier) UpsertProvisionerDaemon(ctx context.Context, arg database.Upse
 	return q.db.UpsertProvisionerDaemon(ctx, arg)
 }
 
-<<<<<<< HEAD
 func (q *querier) UpsertReportGeneratorLog(ctx context.Context, arg database.UpsertReportGeneratorLogParams) error {
 	panic("not implemented")
-=======
+}
+
 func (q *querier) UpsertRuntimeConfig(ctx context.Context, arg database.UpsertRuntimeConfigParams) error {
 	if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {
 		return err
 	}
 	return q.db.UpsertRuntimeConfig(ctx, arg)
->>>>>>> main
 }
 
 func (q *querier) UpsertTailnetAgent(ctx context.Context, arg database.UpsertTailnetAgentParams) (database.TailnetAgent, error) {
Original file line number	Diff line number	Diff line change
`@@ -1871,16 +1871,15 @@ func (q *querier) GetReplicasUpdatedAfter(ctx context.Context, updatedAt time.Ti`
`1871`	`1871`	`return q.db.GetReplicasUpdatedAfter(ctx, updatedAt)`
`1872`	`1872`	`}`
`1873`	`1873`
`1874`		`-<<<<<<< HEAD`
`1875`	`1874`	`func (q *querier) GetReportGeneratorLogByUserAndTemplate(ctx context.Context, arg database.GetReportGeneratorLogByUserAndTemplateParams) (database.ReportGeneratorLog, error) {`
`1876`	`1875`	`panic("not implemented")`
`1877`		`-=======`
	`1876`	`+}`
	`1877`	`+`
`1878`	`1878`	`func (q *querier) GetRuntimeConfig(ctx context.Context, key string) (string, error) {`
`1879`	`1879`	`if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {`
`1880`	`1880`	`return "", err`
`1881`	`1881`	`}`
`1882`	`1882`	`return q.db.GetRuntimeConfig(ctx, key)`
`1883`		`->>>>>>> main`
`1884`	`1883`	`}`
`1885`	`1884`
`1886`	`1885`	`func (q *querier) GetTailnetAgents(ctx context.Context, id uuid.UUID) ([]database.TailnetAgent, error) {`
`@@ -3937,16 +3936,15 @@ func (q *querier) UpsertProvisionerDaemon(ctx context.Context, arg database.Upse`
`3937`	`3936`	`return q.db.UpsertProvisionerDaemon(ctx, arg)`
`3938`	`3937`	`}`
`3939`	`3938`
`3940`		`-<<<<<<< HEAD`
`3941`	`3939`	`func (q *querier) UpsertReportGeneratorLog(ctx context.Context, arg database.UpsertReportGeneratorLogParams) error {`
`3942`	`3940`	`panic("not implemented")`
`3943`		`-=======`
	`3941`	`+}`
	`3942`	`+`
`3944`	`3943`	`func (q *querier) UpsertRuntimeConfig(ctx context.Context, arg database.UpsertRuntimeConfigParams) error {`
`3945`	`3944`	`if err := q.authorizeContext(ctx, policy.ActionCreate, rbac.ResourceSystem); err != nil {`
`3946`	`3945`	`return err`
`3947`	`3946`	`}`
`3948`	`3947`	`return q.db.UpsertRuntimeConfig(ctx, arg)`
`3949`		`->>>>>>> main`
`3950`	`3948`	`}`
`3951`	`3949`
`3952`	`3950`	`func (q *querier) UpsertTailnetAgent(ctx context.Context, arg database.UpsertTailnetAgentParams) (database.TailnetAgent, error) {`