From 94d9e91443576bf616c9e8f99ed1ece2f096f8b5 Mon Sep 17 00:00:00 2001
From: marcinzelent <marcin@zelent.net>
Date: Sat, 6 May 2017 18:20:19 +0200
Subject: Merge.

---
 ApartmentManager/HousingWebApi/HousingWebApi.csproj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ApartmentManager/HousingWebApi/HousingWebApi.csproj b/ApartmentManager/HousingWebApi/HousingWebApi.csproj
index 6f8fde1..63d4995 100644
--- a/ApartmentManager/HousingWebApi/HousingWebApi.csproj
+++ b/ApartmentManager/HousingWebApi/HousingWebApi.csproj
@@ -198,7 +198,7 @@
     <Compile Include="Models\PastContractOwner.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Models\Resident.cs" />
-    <Compile Include="ResidentList.cs" />
+    <Compile Include="Models\ResidentList.cs" />
     <Compile Include="Models\User.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -238,7 +238,9 @@
     <Content Include="Scripts\modernizr-2.6.2.js" />
     <Content Include="Scripts\respond.js" />
     <Content Include="Scripts\respond.min.js" />
-    <Content Include="Web.config" />
+    <Content Include="Web.config">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Web.Debug.config">
       <DependentUpon>Web.config</DependentUpon>
     </Content>
-- 
cgit v1.2.3