• Riegel's avatar
    Merge branch 'master' into 'dev' · 5950ea5f
    Riegel authored
    # Conflicts:
    #   CityDoctorParent/CityDoctorCheckResult/pom.xml
    #   CityDoctorParent/CityDoctorEdge/pom.xml
    #   CityDoctorParent/CityDoctorEdge/src/main/java/de/hft/stuttgart/citydoctor2/edge/PolyLine.java
    #   CityDoctorParent/CityDoctorModel/pom.xml
    #   CityDoctorParent/CityDoctorValidation/pom.xml
    #   CityDoctorParent/pom.xml
    5950ea5f