Resolved conflicts

pkg/tsdb/opentsdb/opentsdb.go

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