fixes merge removes unused file

This commit is contained in:
Shannon
2017-09-07 23:03:01 +10:00
parent 65ece33ca9
commit 6ea92daa70
2 changed files with 1 additions and 31 deletions

View File

@@ -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

View File

@@ -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']);
});
}
});