# Conflicts:
#	internal/services/appointment_service.go

# Conflicts:
#	api/rest/routes/appointment_router.go
#	api/rest/routes/building_router.go.disabled
#	database/mongo/repositories/building_repository.go.disabled
#	database/mongo/repositories/room_repository.go
#	database/mongo/repositories/room_repository_test.go
#	internal/services/appointment_service.go
#	internal/services/room_service_test.go

Testing

See merge request !31

Merge branch 'dev' into feat/check-building-opening-times

See merge request !30

Feat/check building opening times

See merge request !29

# Conflicts:
#	api/rest/controllers/room_controller_test.go
#	internal/model/building.go
#	internal/services/appointment_service_test.go