mirror of
				https://github.com/grafana/grafana.git
				synced 2025-02-25 18:55:37 -06:00 
			
		
		
		
	fix conflict
This commit is contained in:
		@@ -188,7 +188,7 @@ func (e *CloudWatchExecutor) executeQuery(ctx context.Context, parameters *simpl
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return nil, err
 | 
			
		||||
	}
 | 
			
		||||
	metrics.M_Aws_CloudWatch_GetMetricStatistics.Inc(1)
 | 
			
		||||
	metrics.M_Aws_CloudWatch_GetMetricStatistics.Inc()
 | 
			
		||||
 | 
			
		||||
	queryRes, err := parseResponse(resp, query)
 | 
			
		||||
	if err != nil {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user