mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Resolved conflicts
This commit is contained in:
commit
4247e92e87
@ -149,4 +149,4 @@ func (e *OpenTsdbExecutor) parseResponse(query OpenTsdbQuery, res *http.Response
|
||||
|
||||
queryResults["A"] = queryRes
|
||||
return queryResults, nil
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user