Resolved conflicts

This commit is contained in:
utkarshcmu 2016-10-14 00:01:36 -07:00
commit 4247e92e87

View File

@ -149,4 +149,4 @@ func (e *OpenTsdbExecutor) parseResponse(query OpenTsdbQuery, res *http.Response
queryResults["A"] = queryRes
return queryResults, nil
}
}