# Conflicts: # BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs # BeWo/ServiceProxy/Generated.cs