Skip to content

Commit 7e7235c

Browse files
committed
Fixing broken merge.
1 parent 26dca9a commit 7e7235c

File tree

1 file changed

+0
-22
lines changed

1 file changed

+0
-22
lines changed

eFormAPI/eFormAPI/eFormAPI.Web.csproj

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -359,18 +359,6 @@
359359
<Compile Include="Migrations\EformMigrationsConfiguration.cs" />
360360
<Compile Include="Properties\AssemblyInfo.cs" />
361361
<Compile Include="Infrastructure\Services\EmailService.cs" />
362-
<Compile Include="Properties\Resources.da.Designer.cs">
363-
<DependentUpon>Resources.da.resx</DependentUpon>
364-
<AutoGen>True</AutoGen>
365-
<DesignTime>True</DesignTime>
366-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
367-
</Compile>
368-
<Compile Include="Properties\Resources.Designer.cs">
369-
<AutoGen>True</AutoGen>
370-
<DesignTime>True</DesignTime>
371-
<DependentUpon>Resources.resx</DependentUpon>
372-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
373-
</Compile>
374362
<Compile Include="Startup.cs" />
375363
</ItemGroup>
376364
<ItemGroup>
@@ -415,16 +403,6 @@
415403
<EmbeddedResource Include="Migrations\201806142159030_AddLocaleForUser.resx">
416404
<DependentUpon>201806142159030_AddLocaleForUser.cs</DependentUpon>
417405
</EmbeddedResource>
418-
<EmbeddedResource Include="Properties\Resources.da.resx">
419-
<Generator>ResXFileCodeGenerator</Generator>
420-
<LastGenOutput>Resources.da.Designer.cs</LastGenOutput>
421-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
422-
</EmbeddedResource>
423-
<EmbeddedResource Include="Properties\Resources.resx">
424-
<Generator>ResXFileCodeGenerator</Generator>
425-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
426-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
427-
</EmbeddedResource>
428406
</ItemGroup>
429407
<ItemGroup>
430408
<Folder Include="Plugins\" />

0 commit comments

Comments
 (0)