From bef8b22bbbfe1abeabb2759ca4ef95747a641220 Mon Sep 17 00:00:00 2001
From: alexY <devnull@localhost>
Date: Tue, 28 Apr 2015 12:00:02 +0300
Subject: [PATCH] merge

---
 .../WebsitePanel.Portal.Modules.csproj        | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
index 0bdc3196..a79496b7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
@@ -339,7 +339,7 @@
     <Compile Include="ProviderControls\HyperV2012R2_Settings.ascx.designer.cs">
       <DependentUpon>HyperV2012R2_Settings.ascx</DependentUpon>
     </Compile>
-   <Compile Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx.cs">
+    <Compile Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx.cs">
       <DependentUpon>UserPasswordExpirationNotificationView.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
@@ -347,27 +347,6 @@
       <DependentUpon>SearchObject.ascx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-   <Compile Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx.designer.cs">
-      <DependentUpon>UserPasswordExpirationNotificationView.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="SettingsUserPasswordExpirationLetter.ascx.cs">
-      <DependentUpon>SettingsUserPasswordExpirationLetter.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="SettingsUserPasswordExpirationLetter.ascx.designer.cs">
-      <DependentUpon>SettingsUserPasswordExpirationLetter.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="SettingsUserPasswordResetLetter.ascx.cs">
-      <DependentUpon>SettingsUserPasswordResetLetter.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
-    <Compile Include="SettingsUserPasswordResetLetter.ascx.designer.cs">
-      <DependentUpon>SettingsUserPasswordResetLetter.ascx</DependentUpon>
-    </Compile>
-    <Compile Include="SearchObject.ascx">
-      <DependentUpon>SearchObject.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
-    </Compile>
     <Compile Include="SearchObject.ascx.designer.cs">
       <DependentUpon>SearchObject.ascx</DependentUpon>
     </Compile>
@@ -4911,7 +4890,6 @@
     <Content Include="ProviderControls\HyperV2012R2_Settings.ascx" />
     <Content Include="SearchObject.ascx" />
     <Content Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx" />
-
     <Content Include="SearchObject.ascx" />
     <Content Include="SettingsUserPasswordExpirationLetter.ascx" />
     <Content Include="SettingsUserPasswordResetLetter.ascx" />
@@ -5227,7 +5205,6 @@
     </Content>
     <Content Include="UserControls\App_LocalResources\MailAccountActions.ascx.resx" />
     <Content Include="ScheduleTaskControls\App_LocalResources\UserPasswordExpirationNotificationView.ascx.resx" />
-
     <Content Include="SkinControls\App_LocalResources\SearchObject.ascx.resx" />
     <EmbeddedResource Include="UserControls\App_LocalResources\WebsiteActions.ascx.resx" />
     <Content Include="VPS\UserControls\App_LocalResources\Generation.ascx.resx">