mergekonfl.
This commit is contained in:
@@ -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>
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
GrapeCity.ActiveReports.SectionReport, GrapeCity.ActiveReports, Version=15.2.3.0, Culture=neutral, PublicKeyToken=cc4967777c49a3ff
|
||||
Reference in New Issue
Block a user