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

@@ -540,6 +540,12 @@
<Compile Include="Benachrichtigung\frmAvisoBenachrichtigungReminderBestaetigen.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmDigicust.Designer.vb">
<DependentUpon>frmDigicust.vb</DependentUpon>
</Compile>
<Compile Include="frmDigicust.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmATEZ_NCTS.Designer.vb">
<DependentUpon>frmATEZ_NCTS.vb</DependentUpon>
</Compile>
@@ -1134,6 +1140,9 @@
<EmbeddedResource Include="Benachrichtigung\frmAvisoBenachrichtigungReminderBestaetigen.resx">
<DependentUpon>frmAvisoBenachrichtigungReminderBestaetigen.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmDigicust.resx">
<DependentUpon>frmDigicust.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmATEZ_NCTS.resx">
<DependentUpon>frmATEZ_NCTS.vb</DependentUpon>
</EmbeddedResource>