Skip to content

Commit

Permalink
Merge pull request #1464 from umbraco/temp-U4-8939
Browse files Browse the repository at this point in the history
Temp u4 8939
  • Loading branch information
Shazwazza authored Sep 5, 2016
2 parents c67adcc + 28b4945 commit 48786fc
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 11 deletions.
1 change: 0 additions & 1 deletion src/Umbraco.Web.UI/umbraco/users/PermissionEditor.aspx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<umb:CssInclude ID="CssInclude2" runat="server" FilePath="css/permissionsEditor.css" PathNameAlias="UmbracoRoot" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="css/umbracoGui.css" PathNameAlias="UmbracoRoot" />
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="PermissionsEditor.js" />
<umb:JsInclude ID="JsInclude2" runat="server" FilePath="../lib/jquery-migrate/jquery-migrate.min.js" />

</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<umb:CssInclude ID="CssInclude2" runat="server" FilePath="css/permissionsEditor.css" PathNameAlias="UmbracoRoot" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="css/umbracoGui.css" PathNameAlias="UmbracoRoot" />
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="PermissionsEditor.js" />
<umb:JsInclude ID="JsInclude2" runat="server" FilePath="../lib/jquery-migrate/jquery-migrate.min.js" />

</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 48786fc

Please sign in to comment.