From be4edf15eebc65feb78c45438e1c2d072908b199 Mon Sep 17 00:00:00 2001 From: Andrew Kushnir Date: Tue, 9 Oct 2018 17:30:46 -0700 Subject: [PATCH] fix(core): resolving merge conflicts in query.ts (#26324) PR Close #26324 --- packages/core/src/render3/query.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/src/render3/query.ts b/packages/core/src/render3/query.ts index 1245e208ed..89f6872d7a 100644 --- a/packages/core/src/render3/query.ts +++ b/packages/core/src/render3/query.ts @@ -23,8 +23,8 @@ import {_getViewData, assertPreviousIsParent, getOrCreateCurrentQueries, store, import {DirectiveDef, unusedValueExportToPlacateAjd as unused1} from './interfaces/definition'; import {unusedValueExportToPlacateAjd as unused2} from './interfaces/injector'; import {TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeFlags, TNodeType, unusedValueExportToPlacateAjd as unused3} from './interfaces/node'; -import {LQueries, QueryReadType, unusedValueExportToPlacateAjd as unused4} from './interfaces/query'; -import {DIRECTIVES, LViewData, TVIEW} from './interfaces/view'; +import {LQueries, unusedValueExportToPlacateAjd as unused4} from './interfaces/query'; +import {LViewData, TVIEW} from './interfaces/view'; import {flatten, isContentQueryHost} from './util'; import {createElementRef, createTemplateRef} from './view_engine_compatibility';