From f3ab5276889fe3c578a8e3db45087e3c2327f837 Mon Sep 17 00:00:00 2001
From: vsavkin <avix1000@gmail.com>
Date: Thu, 8 Oct 2015 13:59:09 -0700
Subject: [PATCH] resolve rebase conflicts

---
 modules/angular2/test/public_api_spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/angular2/test/public_api_spec.ts b/modules/angular2/test/public_api_spec.ts
index 1f8db59850..bee365513c 100644
--- 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',