Commit df1edb59 authored by Paul Asmuth's avatar Paul Asmuth
Browse files

fixed a merge conflict

parent 77f50c11
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ module FnordMetric::GaugeCalculations
  def field_values_at(time, opts={}, &block)
    opts[:max_fields] ||= 50
    field_values = sync_redis.zrevrange(
      tick_key(time),
      tick_key(time, opts[:append]),
      0, opts[:max_fields]-1,
      :withscores => true
    )
+2 −2

File changed.

Contains only whitespace changes.

+3 −3

File changed.

Contains only whitespace changes.