# Conflicts: # BeWo/View/Detail/Report/FlexibleReportView.xaml # BeWo/View/Detail/Report/FlexibleReportView.xaml.cs # BeWoPlanerMobil/Scripts/mainView.js # BeWoPlanerMobil/Views/Shared/_Layout.cshtml # Service/ServiceImplementations/OperationsServiceImp.cs