public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflicts (#32567)

Browse Source
This commit is contained in:
Will Browne
2021-04-01 10:05:34 +02:00
committed by GitHub
parent d8af326511
commit 86e2d2ab82
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1
View File
@@ -44,6 +44,7 @@ require (
github.com/google/uuid v1.2.0
github.com/gosimple/slug v1.9.0
github.com/grafana/grafana-aws-sdk v0.3.0
github.com/grafana/grafana-aws-sdk v0.4.0
github.com/grafana/grafana-plugin-model v0.0.0-20190930120109-1fc953a61fb4
github.com/grafana/grafana-plugin-sdk-go v0.88.0
github.com/grafana/loki v1.6.2-0.20201026154740-6978ee5d7387