More fixes to botched merge. I got in a hurry.

Author: Byron Sommardahl

src/Nancy.Authentication.Stateless/Nancy.Authentication.Stateless.csproj

@@ -41,7 +41,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="StatelessAuthentication.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StatelessAuthenticationConfiguration.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -50,6 +49,9 @@
       <Name>Nancy</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/Nancy.Authentication.Stateless/StatelessAuthentication.cs

@@ -47,17 +47,17 @@ static Func<NancyContext, Response> GetLoadAuthenticationHook(StatelessAuthentic
             }
 
             return context =>
-                {
-                    try
-                    {
-                        context.CurrentUser = configuration.GetUserIdentity(context);
-                        return context.Response;
-                    }
-                    catch (Exception)
-                    {
-                        return context.Response;
-                    }
-                };
+            {
+                try
+                {
+                    context.CurrentUser = configuration.GetUserIdentity(context);
+                    return context.Response;
+                }
+                catch (Exception)
+                {
+                    return context.Response;
+                }
+            };
         }
     }
 }

src/Nancy.Demo.Authentication.Stateless/Nancy.Demo.Authentication.Stateless.csproj

@@ -40,7 +40,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Folder Include="Properties\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.