Fix rebase errors

vega · Aug 1, 2018 · e7ebd7a · e7ebd7a
1 parent ea53045
commit e7ebd7a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/compile/data/calculate.ts b/src/compile/data/calculate.ts
@@ -16,7 +16,7 @@ import {getDependentFields} from './expressions';
  * We don't know what a calculate node depends on so we should never move it beyond anything that produces fields.
  */
 
-export class CalculateNode extends DataFlowNode {
+export class CalculateNode extends TransformNode {
   private _dependentFields: StringSet;
 
   public clone() {

diff --git a/src/compile/data/filter.ts b/src/compile/data/filter.ts
@@ -3,8 +3,8 @@ import {expression, Predicate} from '../../predicate';
 import {duplicate, hash, StringSet} from '../../util';
 import {VgFilterTransform} from '../../vega.schema';
 import {Model} from '../model';
-import {getDependentFields} from './expressions';
 import {DataFlowNode, TransformNode} from './dataflow';
+import {getDependentFields} from './expressions';
 
 export class FilterNode extends TransformNode {
   private expr: string;