Merge branch 'master' into feature_rene_13_dakota
# Conflicts: # BeWo/BeWo.csproj # BeWo/ServiceProxy/Generated.cs # BeWo/ServiceProxy/ServiceFacade.cs # Data/Access/GenericDAO.cs # Data/Access/SearchDAO.cs # Data/Data.csproj # Service/DCEntityMapper/Compact/CompactCustomerDC_Customer.cs # Service/DCEntityMapper/Compact/CompactEmployeeDC_Employee.cs # Service/DCEntityMapper/Compact/CompactOrganisationDC_Organisation.cs # Service/DCEntityMapper/Compact/CompactPersonDC_Person.cs # Service/DCEntityMapper/Compact/CompactSupportConceptDC_SupportConcept.cs # Shared/Shared.csproj
This commit is contained in:
@@ -155,22 +155,22 @@
|
||||
<None Include="app.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="KTDatei\AO05Q125.ke0.txt">
|
||||
<Content Include="KTDatei\AO.txt">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="KTDatei\BK05Q125.ke3.txt">
|
||||
<Content Include="KTDatei\BK.txt">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="KTDatei\BN05Q424.ke1.txt">
|
||||
<Content Include="KTDatei\BN.txt">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="KTDatei\EK05Q125.ke0.txt">
|
||||
<Content Include="KTDatei\EK.txt">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="KTDatei\IK05Q125.ke1.txt">
|
||||
<Content Include="KTDatei\IK.txt">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="KTDatei\LK05Q223.ke0.txt">
|
||||
<Content Include="KTDatei\LK.txt">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
|
||||
Reference in New Issue
Block a user