From 6c526b24a032a7f929fc8ed276ae868f6a567abd Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 18 Jul 2018 10:32:50 +0200
Subject: [PATCH] Post-merge fixes

---
 src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs | 1 -
 src/Umbraco.Core/Models/Identity/IdentityUser.cs           | 5 +----
 src/Umbraco.Core/Services/IFileService.cs                  | 1 -
 src/Umbraco.Tests/Testing/UmbracoTestBase.cs               | 7 +++----
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
index 302ccbcc54..b4d9bb2c8a 100644
--- a/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
+++ b/src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
@@ -35,7 +35,6 @@ namespace Umbraco.Core.Models.Identity
         private int[] _startContentIds;
         private DateTime? _lastPasswordChangeDateUtc;
 
-
         /// <summary>
         ///  Used to construct a new instance without an identity
         /// </summary>
diff --git a/src/Umbraco.Core/Models/Identity/IdentityUser.cs b/src/Umbraco.Core/Models/Identity/IdentityUser.cs
index b8ed355c55..70f2cee9dd 100644
--- a/src/Umbraco.Core/Models/Identity/IdentityUser.cs
+++ b/src/Umbraco.Core/Models/Identity/IdentityUser.cs
@@ -18,10 +18,8 @@ namespace Umbraco.Core.Models.Identity
         where TRole : IdentityUserRole<string>
         where TClaim : IdentityUserClaim<TKey>
     {
-
         /// <summary>
-        /// Constructor
-        ///
+        /// Initializes a new instance of the <see cref="IdentityUser{TKey, TLogin, TRole, TClaim}"/> class.
         /// </summary>
         public IdentityUser()
         {
@@ -77,7 +75,6 @@ namespace Umbraco.Core.Models.Identity
 
         /// <summary>
         /// DateTime in UTC when the password was last changed.
-        /// 
         /// </summary>
         public virtual DateTime? LastPasswordChangeDateUtc { get; set; }
 
diff --git a/src/Umbraco.Core/Services/IFileService.cs b/src/Umbraco.Core/Services/IFileService.cs
index d77b2080ee..a61faa10c7 100644
--- a/src/Umbraco.Core/Services/IFileService.cs
+++ b/src/Umbraco.Core/Services/IFileService.cs
@@ -358,6 +358,5 @@ namespace Umbraco.Core.Services
         /// <param name="snippetName">The name of the snippet</param>
         /// <returns>The content of the partial view.</returns>
         string GetPartialViewSnippetContent(string snippetName);
-        
     }
 }
diff --git a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
index 99b6fc4f22..5cd884b4c6 100644
--- a/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+++ b/src/Umbraco.Tests/Testing/UmbracoTestBase.cs
@@ -181,6 +181,8 @@ namespace Umbraco.Tests.Testing
             // imported from TestWithSettingsBase
             // which was inherited by TestWithApplicationBase so pretty much used everywhere
             Umbraco.Web.Composing.Current.UmbracoContextAccessor = new TestUmbracoContextAccessor();
+
+            // web
             Container.Register(_ => Umbraco.Web.Composing.Current.UmbracoContextAccessor);
             Container.RegisterSingleton<PublishedRouter>();
             Container.RegisterCollectionBuilder<ContentFinderCollectionBuilder>();
@@ -189,8 +191,7 @@ namespace Umbraco.Tests.Testing
         }
 
         protected virtual void ComposeWtf()
-        {   
-
+        {
             // what else?
             var runtimeStateMock = new Mock<IRuntimeState>();
             runtimeStateMock.Setup(x => x.Level).Returns(RuntimeLevel.Run);
@@ -336,8 +337,6 @@ namespace Umbraco.Tests.Testing
             Container.RegisterCollectionBuilder<DataEditorCollectionBuilder>();
             Container.RegisterSingleton<PropertyEditorCollection>();
             Container.RegisterSingleton<ParameterEditorCollection>();
-
-
         }
 
         #endregion