fix

mtojek · mtojek · commit 469fcc274e11 · 2023-07-07T14:23:52.000+02:00
diff --git a/coderd/database/dbfake/dbfake.go b/coderd/database/dbfake/dbfake.go
@@ -3966,11 +3966,7 @@ func (q *fakeQuerier) InsertTemplateVersionParameter(_ context.Context, arg data
 		ValidationMonotonic: arg.ValidationMonotonic,
 		Required:            arg.Required,
 		DisplayOrder:        arg.DisplayOrder,
-<<<<<<< HEAD
-		LegacyVariableName:  arg.LegacyVariableName,
 		Ephemeral:           arg.Ephemeral,
-=======
->>>>>>> main
 	}
 	q.templateVersionParameters = append(q.templateVersionParameters, param)
 	return param, nil
