Skip to content

Commit be4edf1

Browse files
AndrewKushnirjasonaden
authored andcommitted
fix(core): resolving merge conflicts in query.ts (angular#26324)
PR Close angular#26324
1 parent d5e9405 commit be4edf1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

packages/core/src/render3/query.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import {_getViewData, assertPreviousIsParent, getOrCreateCurrentQueries, store,
2323
import {DirectiveDef, unusedValueExportToPlacateAjd as unused1} from './interfaces/definition';
2424
import {unusedValueExportToPlacateAjd as unused2} from './interfaces/injector';
2525
import {TContainerNode, TElementContainerNode, TElementNode, TNode, TNodeFlags, TNodeType, unusedValueExportToPlacateAjd as unused3} from './interfaces/node';
26-
import {LQueries, QueryReadType, unusedValueExportToPlacateAjd as unused4} from './interfaces/query';
27-
import {DIRECTIVES, LViewData, TVIEW} from './interfaces/view';
26+
import {LQueries, unusedValueExportToPlacateAjd as unused4} from './interfaces/query';
27+
import {LViewData, TVIEW} from './interfaces/view';
2828
import {flatten, isContentQueryHost} from './util';
2929
import {createElementRef, createTemplateRef} from './view_engine_compatibility';
3030

0 commit comments

Comments
 (0)