Resolved merge conflicts

2016-05-12 16:03:19 -07:00
parent e5ef7c0c22
commit bd686790dc
11 changed files with 53 additions and 91 deletions
--- a/platform/commonUI/edit/bundle.js
+++ b/platform/commonUI/edit/bundle.js
@@ -201,7 +201,8 @@ define([
                    "description": "Discard changes made to these objects.",
                    "depends": [
                        "$injector",
-                        "navigationService"
+                        "navigationService",
+                        "$window"
                    ]
                }
            ],