resolves merge conflicts (#57840)

This commit is contained in:
Christopher Moyer
2022-10-28 13:57:12 -05:00
committed by GitHub
parent 85f1aab363
commit 82430165ee
29 changed files with 137 additions and 147 deletions
@@ -17,7 +17,7 @@ This API allows you to interact programmatically with the [Reporting]({{< relref
> The Reporting API is not stabilized yet, it is still in active development and may change without prior notice.
> Reporting is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "../../enterprise/" >}}).
> Reporting is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}).
> If you are running Grafana Enterprise, for some endpoints you'll need to have specific permissions. Refer to [Role-based access control permissions]({{< relref "../../administration/roles-and-permissions/access-control/custom-role-actions-scopes/" >}}) for more information.