Skip to content

Commit

Permalink
Fix weird merge error
Browse files Browse the repository at this point in the history
- The merge from master should have replaced the previous lines with these
  but somehow it just removed them
  • Loading branch information
kevinhinterlong committed Jul 11, 2017
1 parent 05a9f29 commit b76b526
Showing 1 changed file with 2 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ class ThetaSketchIntersectionReportingResources extends Specification {
public DimensionDictionary dimensionDict
public MetricDictionary metricDict
public LogicalTable table
public PostAggregation fooPostAggregation
public Filter filter
public JsonNode filterObj
public Set<FilteredAggregation> fooNoBarFilteredAggregationSet
public Set<FilteredAggregation> fooRegFoosFilteredAggregationSet
Expand Down

0 comments on commit b76b526

Please sign in to comment.