From 4fbf547bfc6904b1a639b3b480a53462ffe6330b Mon Sep 17 00:00:00 2001
From: Henry <akhenry@gmail.com>
Date: Tue, 8 Dec 2015 14:07:32 -0800
Subject: [PATCH] Corrected merge issues from Master

---
 platform/commonUI/browse/bundle.json                          | 2 +-
 platform/commonUI/browse/src/creation/CreateActionProvider.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/commonUI/browse/bundle.json b/platform/commonUI/browse/bundle.json
index d1f2d0f964..8c8f52af21 100644
--- a/platform/commonUI/browse/bundle.json
+++ b/platform/commonUI/browse/bundle.json
@@ -157,7 +157,7 @@
                 "type": "provider",
                 "implementation": "creation/CreateActionProvider.js",
                 "depends": ["$q", "typeService",
-                    "navigationService"]
+                    "navigationService", "policyService"]
             },
             {
                 "key": "CreationService",
diff --git a/platform/commonUI/browse/src/creation/CreateActionProvider.js b/platform/commonUI/browse/src/creation/CreateActionProvider.js
index 14db1c8656..0a8d145b4e 100644
--- a/platform/commonUI/browse/src/creation/CreateActionProvider.js
+++ b/platform/commonUI/browse/src/creation/CreateActionProvider.js
@@ -46,10 +46,11 @@ define(
          *        introduced in this bundle), responsible for handling actual
          *        object creation.
          */
-        function CreateActionProvider($q, typeService, navigationService) {
+        function CreateActionProvider($q, typeService, navigationService, policyService) {
             this.typeService = typeService;
             this.navigationService = navigationService;
             this.$q = $q;
+            this.policyService = policyService;
         }
 
         CreateActionProvider.prototype.getActions = function (actionContext) {