mergekonfl.

This commit is contained in:
2023-09-08 13:29:54 +02:00
parent 3698fa827b
commit 71e140a23f
13 changed files with 3079 additions and 502 deletions

View File

@@ -211,7 +211,6 @@
<EmbeddedResource Include="frmGrayOut.resx">
<DependentUpon>frmGrayOut.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="My Project\licenses.licx" />
<EmbeddedResource Include="My Project\Resources.resx">
<Generator>VbMyResourcesResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.vb</LastGenOutput>

View File

@@ -1 +0,0 @@
GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff