# Conflicts: # BeWo/View/ChatView.xaml.cs # BeWoChatServer/Server.cs # BeWoOhneReports.v12.suo # BeWoPlanerMobil/logs/Traces.svclog # Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs # Service/ServiceImplementations/OperationsServiceImp.cs
# Conflicts: # BeWo/View/ChatView.xaml.cs # BeWoChatServer/Server.cs # BeWoOhneReports.v12.suo # BeWoPlanerMobil/logs/Traces.svclog # Service/DCEntityMapper/ChatMessageDC_ChatMessage.cs # Service/ServiceImplementations/OperationsServiceImp.cs