# Conflicts: # BeWo/View/Detail/Report/FlexibleReportView.xaml # BeWo/View/Detail/Report/FlexibleReportView.xaml.cs # Data/Data.csproj # Service/ServiceContracts/IOperationsService.cs # Service/ServiceImplementations/OperationsServiceImp.cs # Shared/BeWoEntityEnums.cs