From 6ea92daa70cc834cc8e33409f5f404794de025b9 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 7 Sep 2017 23:03:01 +1000
Subject: [PATCH] fixes merge removes unused file

---
 src/Umbraco.Core/Models/UmbracoObjectTypes.cs |  2 +-
 src/Umbraco.Web.UI/Umbraco/js/install.js      | 30 -------------------
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI/Umbraco/js/install.js

diff --git a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
index 4bcbcdc804..c7ad5eb2aa 100644
--- a/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
+++ b/src/Umbraco.Core/Models/UmbracoObjectTypes.cs
@@ -193,7 +193,7 @@ namespace Umbraco.Core.Models
         [UmbracoObjectType(Constants.ObjectTypes.DocumentBlueprint, typeof(IContent))]
         [FriendlyName("DocumentBlueprint")]
         [UmbracoUdiType(Constants.UdiEntityType.DocumentBluePrint)]
-        DocumentBlueprint
+        DocumentBlueprint,
         
         /// <summary>
         /// Reserved Identifier
diff --git a/src/Umbraco.Web.UI/Umbraco/js/install.js b/src/Umbraco.Web.UI/Umbraco/js/install.js
deleted file mode 100644
index 41aab12c80..0000000000
--- a/src/Umbraco.Web.UI/Umbraco/js/install.js
+++ /dev/null
@@ -1,30 +0,0 @@
-yepnope({
-
-  load: [
-    'lib/jquery/jquery-2.0.3.min.js',
-    
-    /* 1.1.5 */
-    'lib/angular/1.1.5/angular.min.js',
-    'lib/angular/1.1.5/angular-cookies.min.js',
-    'lib/angular/1.1.5/angular-mobile.min.js',
-    'lib/angular/1.1.5/angular-mocks.js',
-    'lib/angular/1.1.5/angular-sanitize.min.js',
-    'lib/underscore/underscore.js',
-    'js/umbraco.servervariables.js',
-    'js/app.dev.js'
-  ],
-
-  complete: function () {
-    jQuery(document).ready(function () {
-
-        angular.module('umbraco.install', [
-            'umbraco.resources',
-            'umbraco.services',
-            'umbraco.httpbackend',
-            'ngMobile'
-           ]);
-
-        angular.bootstrap(document, ['umbraco.install']);
-      });
-  }
-});
\ No newline at end of file