more merge conflict clean up

hawkular · May 26, 2015 · ff8c511 · ff8c511
1 parent 7179b57
commit ff8c511
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java b/...metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
@@ -117,7 +117,7 @@ public void addMetricsData(
                 // TODO This needs to be fix
                 // Temporarily commented out to get it to compile as we midst of updating MetricsService
                 // to use rx.Observable instead of ListenableFuture
-                
+
 //                simpleFuturesList.add(metricsService.addGaugeData(metricsRequest.getGaugeMetrics()));
             }