resolve rebase conflicts

2015-10-08 13:59:09 -07:00 · 2015-10-08 13:59:09 -07:00 · f3ab527688
parent bba0248989
commit f3ab527688
1 changed files with 2 additions and 0 deletions
--- a/modules/angular2/test/public_api_spec.ts
+++ b/modules/angular2/test/public_api_spec.ts
@ -1150,6 +1150,8 @@ var NG_API = [
  'RenderElementRef.renderView',
  'RenderElementRef.renderView=',
  'RenderEventDispatcher:dart',
+  'RenderNgContentCmd.index',
+  'RenderNgContentCmd.index=',
  'Stream:dart',
  'Stream.any():dart',
  'Stream.asBroadcastStream():dart',