resolve rebase conflicts

This commit is contained in:
vsavkin 2015-10-08 13:59:09 -07:00
parent bba0248989
commit f3ab527688
1 changed files with 2 additions and 0 deletions

View File

@ -1150,6 +1150,8 @@ var NG_API = [
'RenderElementRef.renderView', 'RenderElementRef.renderView',
'RenderElementRef.renderView=', 'RenderElementRef.renderView=',
'RenderEventDispatcher:dart', 'RenderEventDispatcher:dart',
'RenderNgContentCmd.index',
'RenderNgContentCmd.index=',
'Stream:dart', 'Stream:dart',
'Stream.any():dart', 'Stream.any():dart',
'Stream.asBroadcastStream():dart', 'Stream.asBroadcastStream():dart',