Resolved conflicts

2016-10-14 00:01:36 -07:00
parent 06f2047ced 1606b74fce
commit 4247e92e87
1 changed files with 1 additions and 1 deletions
@@ -149,4 +149,4 @@ func (e *OpenTsdbExecutor) parseResponse(query OpenTsdbQuery, res *http.Response

  queryResults["A"] = queryRes
  return queryResults, nil
-}
+}